机场部门修改时code值也应发生变化，bug 2812 一次删除多条数据 传入类型修改为string

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

@@ -79,7 +79,7 @@ public class OrgPersonController {
     @ApiOperation(httpMethod = "PUT", value = "更新单位数据", notes = "更新单位数据")
     public ResponseModel<?> updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgPersonDto OrgPersonVo,
                                              @PathVariable Long id) throws Exception {
-        //OrgPersonVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
+        OrgPersonVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
         iOrgUsrService.updateByIdOrgPerson(OrgPersonVo, id);
         return ResponseHelper.buildResponse(null);
     }

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

@@ -78,7 +78,9 @@ public class OrgUsrController extends BaseController {
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     public ResponseModel<?> deleteById(HttpServletRequest request, @PathVariable Long id) {
         // 删除时，只作逻辑删除
-        iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete", CommonConstant.IS_DELETE_01));
+      iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete", CommonConstant.IS_DELETE_01));
+
+     //   iOrgUsrService.updateById(id.toString());
         try {
             eSOrgUsrService.deleteById(id);
             emqKeeper.getMqttClient().publish(airportDeleteTopic, JSON.toJSONString(id).getBytes(), 2, false);

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

@@ -350,6 +350,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         pageBean.setTotal(this.baseMapper.selectPersonListCount(map));
         map.put("pageNum", (pageBean.getCurrent() - 1) * pageBean.getSize());
         map.put("pageSize", pageBean.getSize());
+
         List<Map<String, Object>> list = this.baseMapper.selectPersonList(map);
 
         /*Bug2652 根据名字和工号模糊查询失效 已添加模糊匹配 2021-09-01 陈召 结束*/
@@ -364,18 +365,18 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         List<DynamicFormInstanceDto> list = alertFormValueServiceImpl.listByCalledId(id);
         List<FormValue> formValue = new ArrayList<>();
         for (DynamicFormInstanceDto alertFormValue : list) {
-            /*BUG2580 返回值为code值 修改为类型名称 2021-08-31 陈召 开始 */
-            if (alertFormValue.getFieldValue() != null) {
-                /* 2021 09-08 前端表示getFieldValueLabel无法回显  要求返回值重新改为code值  改动代码 369 377*/
-                /*BUG2580 返回值为code值 修改为类型名称 2021-08-31 陈召 结束 */
+        	  /*修改为动态表单返回的数据参数量 2021-09-08 陈浩 开始 */
+//            if (alertFormValue.getFieldValueLabel() != null) {
+//                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
+//                        alertFormValue.getFieldType(), alertFormValue.getFieldValueLabel(), alertFormValue.getBlock());
+//                formValue.add(value);
+//            } else {
                 FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
-                        alertFormValue.getFieldType(), alertFormValue.getFieldValue(), alertFormValue.getBlock());
+                        alertFormValue.getFieldType(), alertFormValue.getFieldValue(), alertFormValue.getBlock(),alertFormValue.getFieldValueLabel());
                 formValue.add(value);
-            } else {
-                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
-                        alertFormValue.getFieldType(), alertFormValue.getFieldValueLabel(), alertFormValue.getBlock());
-                formValue.add(value);
-            }
+                /*修改为动态表单返回的数据参数量 2021-09-08 陈浩 结束 */
+//            }
+            /*BUG2580 返回值为code值 修改为类型名称 2021-08-31 陈召 开始 */
         }
         return formValue;
 
@@ -387,7 +388,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         List<FormValue> formValue = new ArrayList<>();
         for (DynamicFormInstanceDto alertFormValue : list) {
             FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
-                    alertFormValue.getFieldType(), alertFormValue.getFieldValue(), alertFormValue.getBlock());
+                    alertFormValue.getFieldType(), alertFormValue.getFieldValue(), alertFormValue.getBlock(),alertFormValue.getFieldValueLabel());//陈浩 添加getFieldValueLabel的属性值 2021-09-08
             formValue.add(value);
         }
         return formValue;
@@ -621,6 +622,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgUsr orgUsr = new OrgUsr();
         OrgUsr oriOrgUsr = getById(id);
         BeanUtils.copyProperties(OrgUsrVo, orgUsr);
+        /*部门编辑后 code值也应做出修改 2021-09-09 陈召 开始 */
+        OrgUsr parent = getById(OrgUsrVo.getParentId());
+        if (parent != null){
+            orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
+        }
+        orgUsr.setSequenceNbr(id);
+        /*部门编辑后 code值也应做出修改 2021-09-09 陈召 结束  */
         saveOrgUsr(orgUsr, oriOrgUsr);
         // 保存动态表单数据
         updateDynamicFormInstance(orgUsr.getSequenceNbr(), OrgUsrVo.getDynamicFormValue());
@@ -636,13 +644,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgUsr orgUsr = new OrgUsr();
         OrgUsr oriOrgUsr = getById(id);
         BeanUtils.copyProperties(OrgPersonVo, orgUsr);
+/* Bug 2647  编辑用户所属单位后按单位筛选人员结果错误  增加了 638 639 两行代码 根据修改的部门调整部门code 2021-09-03 陈召  开始*/
+        OrgUsr parent = getById(OrgPersonVo.getParentId());
+        if (parent != null){
+            orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
+        }
+  /* Bug 2647  编辑用户所属单位后按单位筛选人员结果错误  增加了 638 639 两行代码 根据修改的部门调整部门code 2021-09-03 陈召  结束*/
         orgUsr.setSequenceNbr(id);
-        /* Bug 2647  编辑用户所属单位后按单位筛选人员结果错误  增加了 638 639 两行代码 根据修改的部门调整部门code 2021-09-03 陈召  开始*/
-            OrgUsr parent = getById(OrgPersonVo.getParentId());
-            if (!ObjectUtils.isEmpty(parent)){
-                orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
-            }
-        /* Bug 2647  编辑用户所属单位后按单位筛选人员结果错误  增加了 638 639 两行代码 根据修改的部门调整部门code 2021-09-03 陈召  结束*/
         if (!ObjectUtils.isEmpty(OrgPersonVo.getAmosOrgId())) {
             AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
             oriOrgUsr.setAmosOrgCode(user.getRealName());
@@ -967,15 +975,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
             }
             CompanyPerson company = new CompanyPerson();
             BeanUtils.copyProperties(org, company);
-            company.setPersons(this.queryForListByParentIdAndOrgType(org.getSequenceNbr(), OrgPersonEnum.人员.getKey()));
+            company.setPersons(this.queryForListByParentIdAndOrgType(org.getSequenceNbr(), OrgPersonEnum.人员.getKey(), false));
             return company;
         }).filter(c -> {
             return c != null;
         }).collect(Collectors.toList());
     }
 
-    public List<OrgUsrDto> queryForListByParentIdAndOrgType(Long parentId, String bizOrgType) {
-        return this.queryForList(null, false, parentId, bizOrgType);
+    // BUG 2736 人员导出过滤已经删除的数据by kongfm
+    public List<OrgUsrDto> queryForListByParentIdAndOrgType(Long parentId, String bizOrgType, Boolean isDelete) {
+        return this.queryForList(null, false, parentId, bizOrgType, isDelete);
     }
 
     public OrgUsrDto getOrg(String amosUserId) {
@@ -1369,7 +1378,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
        }
        return list;
    }
-
 }