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/FirefightersExcelDto.java

@@ -83,39 +83,42 @@ public class FirefightersExcelDto extends BaseDto {
     @ApiModelProperty(value = "婚姻状况")
     private String maritalStatus;
 
-    @ExcelIgnore
-    @ApiModelProperty(value = "籍贯/户口所在地")
-    private String nativePlace;
+
 
     @ExplicitConstraint(indexNum = 10, sourceClass = RoleNameExplicitConstraint.class,method="getCitys") //动态下拉内容// BUG 2760 修改消防人员导出模板和 导入问题 bykongfm
     @ExcelProperty(value = "户籍所在地", index = 10)
     @ApiModelProperty(value = "籍贯/户口所在地的值")
     private String nativePlaceValue;
 
-    @ExplicitConstraint(indexNum = 11, sourceClass = RoleNameExplicitConstraint.class, method = "getPoliticalOutlook") //固定下拉内容
-    @ExcelProperty(value = "政治面貌", index = 11)
+    // BUG 3658 优化 by kongfm 2021-09-13 需求详细说明 1. 添加两个字段  2. 地区选择联动  只有新增时带联动  编辑时不带联动 3. 导出模板及导入同步修改
+    @ExcelProperty(value = "籍贯/户口所在地详细地址", index = 11)
+    @ApiModelProperty(value = "籍贯/户口所在地详细地址")
+    private String nativePlaceVal;
+
+    @ExplicitConstraint(indexNum = 12, sourceClass = RoleNameExplicitConstraint.class, method = "getPoliticalOutlook") //固定下拉内容
+    @ExcelProperty(value = "政治面貌", index = 12)
     @ApiModelProperty(value = "政治面貌代码")
     private String politicalOutlook;
 
-    @ExplicitConstraint(indexNum = 12, sourceClass = RoleNameExplicitConstraint.class,method="getCitys") //动态下拉内容// BUG 2760 修改消防人员导出模板和 导入问题 bykongfm
-    @ExcelProperty(value = "现居住地", index = 12)
+    @ExplicitConstraint(indexNum = 13, sourceClass = RoleNameExplicitConstraint.class,method="getCitys") //动态下拉内容// BUG 2760 修改消防人员导出模板和 导入问题 bykongfm
+    @ExcelProperty(value = "现居住地", index = 13)
     @ApiModelProperty(value = "现居住地")
     private String residence;
+    // BUG 3658 优化 by kongfm 2021-09-13 需求详细说明 1. 添加两个字段  2. 地区选择联动  只有新增时带联动  编辑时不带联动 3. 导出模板及导入同步修改
+    @ExcelProperty(value = "现居住地详细地址", index = 14)
+    @ApiModelProperty(value = "现居住地详细地址")
+    private String residenceDetailVal;
 
-    @ExcelIgnore
-    @ApiModelProperty(value = "现居住地详情")
-    private String residenceDetails;
-
-    @ExcelProperty(value = "机场住宿情况", index = 13)
+    @ExcelProperty(value = "机场住宿情况", index = 15)
     @ApiModelProperty(value = "机场住宿情况")
     private String airportAccommodation;
 
-    @ExcelProperty(value = "联系电话", index = 14)
+    @ExcelProperty(value = "联系电话", index = 16)
     @ApiModelProperty(value = "手机")
     private String mobilePhone;
 
-    @ExplicitConstraint(type = "RYZT", indexNum = 15, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "人员状态", index = 15)
+    @ExplicitConstraint(type = "RYZT", indexNum = 17, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "人员状态", index = 17)
     @ApiModelProperty(value = "人员状态，在职/离职")
     private String state;
 
@@ -123,21 +126,21 @@ public class FirefightersExcelDto extends BaseDto {
     @ApiModelProperty(value = "人员状态，在职/离职字典code")
     private String stateCode;
 
-    @ExplicitConstraint(type = "GWMC", indexNum = 16, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "岗位名称", index = 16)
+    @ExplicitConstraint(type = "GWMC", indexNum = 18, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "岗位名称", index = 18)
     @ApiModelProperty(value = "岗位名称")
     private String jobTitle;
 
-    @ExcelProperty(value = "紧急联系人姓名", index = 17)
+    @ExcelProperty(value = "紧急联系人姓名", index = 19)
     @ApiModelProperty(value = "紧急联系人姓名")
     private String emergencyContact;
 
-    @ExplicitConstraint(type = "RJGX", indexNum = 18, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "与紧急联系人关系", index = 18)
+    @ExplicitConstraint(type = "RJGX", indexNum = 20, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "与紧急联系人关系", index = 20)
     @ApiModelProperty(value = "紧急联系人与本人所属关系")
     private String relationship;
 
-    @ExcelProperty(value = "紧急联系人电话", index = 19)
+    @ExcelProperty(value = "紧急联系人电话", index = 21)
     @ApiModelProperty(value = "紧急联系人电话")
     private String emergencyContactPhone;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/Firefighters.java

@@ -122,4 +122,11 @@ public class Firefighters extends BaseEntity {
 
     @ApiModelProperty(value = "籍贯/户口所在地的值")
     private String nativePlaceValue;
+
+    // BUG 3658 优化 by kongfm 2021-09-13 需求详细说明 1. 添加两个字段  2. 地区选择联动  只有新增时带联动  编辑时不带联动 3. 导出模板及导入同步修改
+    @ApiModelProperty(value = "户籍所在地详细地址")
+    private String nativePlaceVal;
+
+    @ApiModelProperty(value = "现居住地详细地址")
+    private String residenceDetailVal;
 }

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

@@ -82,8 +82,8 @@
             and a.resource_type= #{par.resourceType}
         </if>
         <if test='par.distance!=null'>
-           <!--  and Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;=
-            #{par.distance} -->
+            and Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;=
+            #{par.distance}
         </if>
         ORDER BY distance limit #{pageNum},#{pageSize}
     </select>
@@ -97,8 +97,8 @@
             and a.resource_type= #{par.resourceType}
         </if>
         <if test='par.distance!=null'>
-          <!--   and Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;=
-            #{par.distance} -->
+           and Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;=
+            #{par.distance}
         </if>
     </select>
     <select id="getWaterResourceTypeList" resultType="com.yeejoin.amos.boot.module.common.api.dto.WaterResourceTypeDto">

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

@@ -47,4 +47,7 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
 
 
     Integer AlertCalledcount(@Param("alertStatus")int alertStatus);
+
+     //未结束灾情列表
+    List<AlertCalled> AlertCalledStatusPage(@Param("current")Integer current, @Param("size")Integer size);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IAlertCalledService.java

@@ -75,4 +75,6 @@ public interface IAlertCalledService {
 
 	Integer AlertCalledcount(int type);
 
+
+	List<AlertCalled> AlertCalledStatusPage(Integer current, Integer size);
 }

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

@@ -186,5 +186,19 @@
     </select>
 
 
+     <!--  未结束警情列表  -->
+    <select id="AlertCalledStatusPage" resultType="com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled">
+
+        select * from jc_alert_called where is_delete=0 and alert_status = 0 ORDER BY response_level_code desc
+	,call_time  limit #{current},#{size}
+
+    </select>
+
+
+
+
+
+
+
 
 </mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -580,15 +580,11 @@ public class CommandController extends BaseController {
     @TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
     @GetMapping(value = "LinkageUnitDto/page")
     @ApiOperation(httpMethod = "GET", value = "联动单位分页查询", notes = "联动单位分页查询")
-    public ResponseModel<Page<LinkageUnitDto>> LinkageUnitDtoQueryForPage(@RequestParam(value = "pageNum") int pageNum,
-                                                            @RequestParam(value = "pageSize") int pageSize,
-                                                            String unitName,String linkageUnitTypeCode, String linkageUnitType, String inAgreement) {
+    public ResponseModel<Page<LinkageUnitDto>> LinkageUnitDtoQueryForPage(@RequestParam(value = "pageNum") int pageNum, @RequestParam(value = "pageSize") int pageSize,String unitName,String linkageUnitTypeCode, String linkageUnitType, String inAgreement) {
         Page<LinkageUnitDto> page = new Page<LinkageUnitDto>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
-        Page<LinkageUnitDto> linkageUnitDtoPage = iLinkageUnitService.queryForLinkageUnitPage(page, false,
-                unitName,linkageUnitTypeCode, linkageUnitType, null, inAgreement);
-
+        Page<LinkageUnitDto> linkageUnitDtoPage = iLinkageUnitService.queryForLinkageUnitPage(page, false, unitName,linkageUnitTypeCode, linkageUnitType, null, inAgreement);
         return ResponseHelper.buildResponse(linkageUnitDtoPage);
     }
 
@@ -627,9 +623,7 @@ public class CommandController extends BaseController {
    @GetMapping(value = "statistics/{id}")
    @ApiOperation(httpMethod = "GET", value = "火灾现场统计", notes = "火灾现场统计")
    public ResponseModel<Object> getStatistics(@PathVariable Long id) {
-
        return ResponseHelper.buildResponse(iAlertCalledService.selectAlertCalledcount(id));
-
    }
     /**
      * * @param null
@@ -673,7 +667,6 @@ public class CommandController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "获取灾情当前阶段", notes = "获取灾情当前阶段")
     public ResponseModel<Object> getstate(@PathVariable Long id) {
         AlertCalled AlertCalled=iAlertCalledService.getAlertCalledById(id);
-
         List<StateDot> list=new ArrayList<>();
         list.add(new StateDot("警情接报"));
         list.add(new StateDot("力量调派"));
@@ -779,16 +772,12 @@ public class CommandController extends BaseController {
 	@ApiOperation(value = "查看文件内容", notes = "查看文件内容")
 	public ResponseModel<Object> lookHtmlText( HttpServletResponse response,@RequestParam(value = "fileUrl")String fileUrl ,@RequestParam(value = "product")String product,@RequestParam(value = "appKey")String appKey,@RequestParam(value = "token")String token /* @PathVariable String fileName */)
 			throws Exception {		
-			String  fileName =readUrl+fileUrl; //目标文件		  
-		    
+			String  fileName =readUrl+fileUrl; //目标文件
 		 if (fileName.endsWith(".doc") || fileName.endsWith(".docx")) {
-			 
 			String htmlPath= System.getProperty("user.dir")+File.separator+"lookHtml"+File.separator+"file"+File.separator;
 			String imagePathStr= System.getProperty("user.dir")+File.separator+"lookHtml"+File.separator+"image"+File.separator;
 			String name = fileUrl.substring(fileUrl.lastIndexOf('/')+1);
-			
-			String htmlFileName = htmlPath + name.substring(0, name.indexOf(".")) +".html";	
-			
+			String htmlFileName = htmlPath + name.substring(0, name.indexOf(".")) +".html";
 			File htmlP = new File(htmlPath);
    			if (!htmlP.exists()) {
    				htmlP.mkdirs();
@@ -827,24 +816,18 @@ public class CommandController extends BaseController {
     @GetMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "GET", value = "根据灾情查询单个航空器信息", notes = "根据灾情查询单个航空器信息")
     public ResponseModel<AircraftDto> seleteaircraftOne(@PathVariable Long sequenceNbr) {
-    	
-    	
-    	
     	// 警情动态表单数据
     			List<AlertFormValue> list = alertFormValueService.getzqlist(sequenceNbr);
     			for (AlertFormValue alertFormValue : list) {
     				if("aircraftModel".equals(alertFormValue.getFieldCode())) {
     					String  aircraftModel=alertFormValue.getFieldValue();
     					if(aircraftModel!=null&&!"".equals(aircraftModel)) {
-    						    					
     						AircraftDto aircraftDto=aircraftService.queryByAircraftSeq(RequestContext.getAgencyCode(),1411994005943717890L);
     						//现场照片 待完成，
-    						
     						return	ResponseHelper.buildResponse(aircraftDto);
     					}
     				}
     			}
-    	  	
         return ResponseHelper.buildResponse(null);
     }
 
@@ -852,7 +835,6 @@ public class CommandController extends BaseController {
     @GetMapping(value = "/getOrgUsrzhDto/{id}")
     @ApiOperation(httpMethod = "GET", value = "根据灾情id处置对象单位详情", notes = "根据灾情id处置对象单位详情")
     public ResponseModel<OrgusrDataxDto> getOrgUsrzhDto(@PathVariable Long id) {
-
         AlertCalled AlertCalled = iAlertCalledService.getAlertCalledById(id);
         String buildId = null;
         OrgusrDataxDto orgusrDataxDto = new OrgusrDataxDto();
@@ -949,8 +931,6 @@ public class CommandController extends BaseController {
     @RequestMapping(value = "/getVideo", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "分页获取视频", notes = "分页获取视频")
     public ResponseModel<Object> getVideo(long current, long size)throws Exception {
-
-
         Page page = new Page(current,  size);
         List<OrderItem>  list= OrderItem.ascs("id");
         page.setOrders(list);
@@ -1011,7 +991,6 @@ public class CommandController extends BaseController {
         OrgusrDataxDto orgusrDataxDto=new OrgusrDataxDto();
         if(AlertCalled.getUnitInvolved()!=null&&!"".equals(AlertCalled.getUnitInvolved())) {
             List<OrgUsrzhDto> orgUsrzhDto= iOrgUsrService.getOrgUsrzhDto( AlertCalled.getUnitInvolved());
-
             if(orgUsrzhDto!=null&&orgUsrzhDto.size()>0&&orgUsrzhDto.get(0)!=null){
                 buildId=orgUsrzhDto.get(0).getBuildId()==null?null:Long.valueOf(orgUsrzhDto.get(0).getBuildId());
             }
@@ -1046,10 +1025,7 @@ public class CommandController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET",value = "app-根据警情id查询力量调派列表",   notes = "app-根据警情id查询力量调派列表")
     @GetMapping(value = "/app/transferList")
-    public ResponseModel getPowerTransferList(@RequestParam String alertId,
-                                              @RequestParam(defaultValue = "team") String type,
-                                              @RequestParam(value = "current") int current,
-                                              @RequestParam(value = "size") int size) {
+    public ResponseModel getPowerTransferList(@RequestParam String alertId,@RequestParam(defaultValue = "team") String type, @RequestParam(value = "current") int current, @RequestParam(value = "size") int size) {
         Page page = new Page();
         page.setSize(size);
         page.setCurrent(current);
@@ -1059,8 +1035,7 @@ public class CommandController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET",value = "app-根据警情id查询力量调派资源统计",   notes = "app-根据警情id查询力量调派资源统计")
     @GetMapping(value = "/app/transfer/statistics")
-    public ResponseModel getPowerTransferStatistics(@RequestParam String alertId,
-                                                    @RequestParam(defaultValue = "team") String type) {
+    public ResponseModel getPowerTransferStatistics(@RequestParam String alertId,  @RequestParam(defaultValue = "team") String type) {
         return ResponseHelper.buildResponse(powerTransferService.getPowerTransferStatistics(Long.valueOf(alertId), type));
     }
 
@@ -1076,7 +1051,6 @@ public class CommandController extends BaseController {
         } catch (Exception e) {
             throw new BaseException("更新车辆状态异常", "", e.getMessage());
         }
-
         return ResponseHelper.buildResponse(true);
     }
 
@@ -1149,20 +1123,29 @@ public class CommandController extends BaseController {
     @GetMapping(value = "/DynamicFlightInfo/{dynamicFlightId}")
     @ApiOperation(httpMethod = "GET", value = "航班信息", notes = "航班信息")
     public ResponseModel<Object> DynamicFlightInfo(@PathVariable String dynamicFlightId) {
-
-
         ResponseModel<Object> dataModel = iotFeignClient.DynamicFlightInfo(dynamicFlightId);
         if (dataModel != null) {
-
             return ResponseHelper.buildResponse(dataModel.getResult());
         }
-
         return ResponseHelper.buildResponse(null);
     }
 
 
 
-
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "AlertCalledStatusPage")
+    @ApiOperation(httpMethod = "GET", value = "未结束的灾情列表", notes = "未结束的灾情列表")
+    public ResponseModel<Page<AlertCalled>> AlertCalledStatusPage(  @RequestParam(value = "current") Integer current, @RequestParam(value = "size") Integer size) {
+        if (null == current || null == size) {
+            current = 1;
+            size = Integer.MAX_VALUE;
+        }
+        List<AlertCalled>  list= iAlertCalledService.AlertCalledStatusPage( current,  size);
+        int num= iAlertCalledService.AlertCalledcount(0);
+        Page<AlertCalled> pageBean = new Page<>(current, size, num);
+        pageBean.setRecords(list);
+        return ResponseHelper.buildResponse(pageBean);
+    }
 
 
 

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

@@ -7,13 +7,7 @@ import com.yeejoin.amos.boot.module.jcs.biz.service.impl.ExcelServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -21,6 +15,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
 
 /**
  * 导出导入
@@ -53,15 +48,22 @@ public class ExcelController extends BaseController {
             throw new RuntimeException("系统异常！");
         }
     }
-
+    /**
+     * * @param Map par  可以传递过滤条件，传入具体实现类中
+     * @return 
+     * <PRE>
+     * author tw
+     * date 2021/9/13
+     * </PRE>
+     */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "导出公用类")
     @GetMapping("/export/{type}")
-    public void getFireStationFile(HttpServletResponse response,  @PathVariable(value = "type")  String type) {
+    public void getFireStationFile(HttpServletResponse response, @PathVariable(value = "type")  String type , @RequestParam Map par) {
         try {
             ExcelEnums excelEnums=  ExcelEnums.getByKey(type);
             ExcelDto excelDto = new ExcelDto(excelEnums.getFileName(), excelEnums.getSheetName(), excelEnums.getClassUrl(), excelEnums.getType());
-            excelService.commonExport(response, excelDto);
+            excelService.commonExport(response, excelDto,par);
         } catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException("系统异常！");

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

@@ -449,7 +449,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
         listdate.add(new KeyValueLabel("伤亡人数", "casualtiesNum", alertCalled.getCasualtiesNum()));
         listdate.add(new KeyValueLabel("联系人", "contactUser", alertCalled.getContactUser()));
         listdate.add(new KeyValueLabel("联系电话", "contactPhone", alertCalled.getContactPhone()));
-        listdate.add(new KeyValueLabel("联系人电话", "contactPhone", alertCalled.getContactPhone()));
+//        listdate.add(new KeyValueLabel("联系人电话", "contactPhone", alertCalled.getContactPhone()));
         list.stream().forEach(alertFormValue -> {
             String valueCode = alertFormValue.getFieldValueCode();
         	if(null == valueCode) {
@@ -674,11 +674,13 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
     //未结案警情统计
     @Override
     public Integer AlertCalledcount(int type) {
-     return alertCalledMapper.AlertCalledcount(1);
+     return alertCalledMapper.AlertCalledcount(0);
     }
 
-
-
+    @Override
+    public List<AlertCalled> AlertCalledStatusPage(Integer current, Integer size) {
+        return alertCalledMapper.AlertCalledStatusPage( current, size);
+    }
 
 
     @Override

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

@@ -29,7 +29,7 @@ public class DispatchMapServiceImpl implements IHomePageService {
 
     @Override
     public Object getHomePageData() {
-       Integer num= alertCalledMapper1.AlertCalledcount(1);
+       Integer num= alertCalledMapper1.AlertCalledcount(0);
         return num;
     }
 }

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

@@ -28,7 +28,7 @@ public class DispatchTaskServiceImpl implements IHomePageService {
 
     @Override
     public Object getHomePageData() {
-       Integer num= alertCalledMapper1.AlertCalledcount(1);
+       Integer num= alertCalledMapper1.AlertCalledcount(0);
         return num;
     }
 }

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

@@ -158,7 +158,7 @@ public class ExcelServiceImpl {
 				true);
 	}
 
-	public void commonExport(HttpServletResponse response, ExcelDto excelDto) {
+	public void commonExport(HttpServletResponse response, ExcelDto excelDto,Map par) {
 		switch (excelDto.getType()) {
 
 		case "WHP":

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/GroupController.java

@@ -95,9 +95,9 @@ public class GroupController extends AbstractBaseController{
 
 		for (DepartmentBo d : departmentBos) {
 			LinkedHashMap<String, Object> dept = new LinkedHashMap<>();
-			dept.put("id", d.getSequenceNbr());
-			dept.put("key", d.getSequenceNbr());
-			dept.put("value", d.getSequenceNbr());
+			dept.put("id", String.valueOf(d.getSequenceNbr()));
+			dept.put("key", String.valueOf(d.getSequenceNbr()));
+			dept.put("value", String.valueOf(d.getSequenceNbr()));
 			dept.put("state", "open");
 			dept.put("type", "department");
 			dept.put("orgCode", loginOrgCode+"-"+d.getSequenceNbr());

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

@@ -324,4 +324,14 @@
             '调派任务状态(执行中：executing，已完成：finished)';
         </sql>
     </changeSet>
+	<changeSet author="kongfm" id="2021-09-13-kongfm-1">
+		<preConditions onFail="MARK_RAN">
+			<tableExists tableName="cb_firefighters"/>
+		</preConditions>
+		<comment>BUG 3658 优化 by kongfm 2021-09-13 需求详细说明 1. 添加两个字段  2. 地区选择联动  只有新增时带联动  编辑时不带联动 3. 导出模板及导入同步修改</comment>
+		<sql>
+			ALTER TABLE `cb_firefighters` add native_place_val varchar(255) COMMENT '户籍所在地详细地址';
+			ALTER TABLE `cb_firefighters` add residence_detail_val varchar(255) COMMENT '现居住地详细地址';
+		</sql>
+	</changeSet>
 </databaseChangeLog>