任务 4933 4932 4931 4928 4927 4926 4918

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

@@ -47,6 +47,10 @@ public class FireStationDto extends BaseDto {
     @ApiModelProperty(value = "值班室电话")
     private String dutyRoomTelephone;
 
+    @ExcelIgnore
+    @ApiModelProperty(value = "负责人名称id")
+    private String personChargeId;
+
     @ExcelProperty(value = "负责人名称", index = 4)
     @ApiModelProperty(value = "负责人名称")
     private String personChargeName;

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

@@ -114,6 +114,13 @@ public class WaterResourceDto extends BaseDto {
 	@ApiModelProperty(value = "联系人姓名")
 	private String contactUser;
 
+	/**
+	 * 联系人姓名id
+	 */
+	@ExcelIgnore
+	@TableField("contact_user_id")
+	private String contactUserId;
+
 	@ExcelProperty(value = "联系人电话", index = 39)
 	@ApiModelProperty(value = "联系人电话")
 	private String contactPhone;

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

@@ -62,6 +62,9 @@ public class FireStation extends BaseEntity {
     @ApiModelProperty(value = "负责人名称")
     private String personChargeName;
 
+    @ApiModelProperty(value = "负责人名称id")
+    private String personChargeId;
+
     @ApiModelProperty(value = "负责人电话")
     private String personChargeTelephone;
 

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

@@ -142,6 +142,13 @@ public class WaterResource extends BaseEntity {
 	private String contactUser;
 
 	/**
+	 * 联系人姓名id
+	 */
+	@TableField("contact_user_id")
+	private String contactUserId;
+
+
+	/**
 	 * 联系人电话
 	 */
 	@TableField("contact_phone")

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java

@@ -169,8 +169,10 @@ public class OrgPersonController {
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
     public ResponseModel<Object> listPage(@RequestParam Map<String, Object> requestBody) {
-        return ResponseHelper.buildResponse(iOrgUsrService.pagePerson(requestBody.get("pageNum").toString(),
-                requestBody.get("pageSize").toString(), requestBody));
+        return ResponseHelper.buildResponse(iOrgUsrService.pagePerson(
+                requestBody.containsKey("pageNum") ? requestBody.get("pageNum").toString()  :  null ,
+                requestBody.containsKey("pageSize") ? requestBody.get("pageSize").toString()  :  null ,
+                requestBody));
     }
 
     /**

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

@@ -374,8 +374,17 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
             map.put("personNumber", req.get("personNumber"));
         }
         if (req.containsKey("company") && !ObjectUtils.isEmpty(req.get("company"))) {
-            req.put("parentId", req.get("company"));
+            req.put("company", req.get("company"));
         }
+
+        if (req.containsKey("bizOrgCode") && !ObjectUtils.isEmpty(req.get("bizOrgCode"))) {
+            LambdaQueryWrapper<OrgUsr> query = new LambdaQueryWrapper<>();
+            query.eq(OrgUsr::getBizOrgCode, req.get("bizOrgCode").toString());
+            OrgUsr orgUsr = this.getOne(query);
+            req.remove("bizOrgCode");
+            map.put("company", orgUsr.getSequenceNbr());
+        }
+
         /* BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始 */
         if (req.get("parentId") != null && req.get("parentId") != "") {
             OrgUsr parent = this.getById(req.get("parentId").toString());

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

@@ -253,7 +253,7 @@ public class ExcelServiceImpl {
 				waterResourceDtoList = waterResourceServiceImpl.exportToExcel(true,par.containsKey("name")?par.get("name").toString():null,
 						par.containsKey("resourceType")?par.get("resourceType").toString():null);
 			}else{
-				waterResourceDtoList = waterResourceServiceImpl.exportToExcel(false,null,null);
+				waterResourceDtoList = waterResourceServiceImpl.exportToExcel(true,null,null);
 			}
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), waterResourceDtoList,
 					WaterResourceDto.class, dataSourcesImpl, false);