机场修改bug 代码同步

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

@@ -368,7 +368,7 @@ public interface IOrgUsrService {
      * @param id
      * @return
      */
-    String deleteFirefighterPeopleById(Long id);
+    String deleteFirefighterPeopleById(Long id, String type);
     
      OrgUsr selectParentOrgUsr(OrgUsr orgUsr);
 

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

@@ -426,8 +426,8 @@ public class OrgPersonController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/people/firefighter/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
-    public ResponseModel<String> deleteFirefighterPeopleById(@PathVariable Long id) {
-        return ResponseHelper.buildResponse(iOrgUsrService.deleteFirefighterPeopleById(id));
+    public ResponseModel<String> deleteFirefighterPeopleById(@PathVariable Long id,@PathVariable String type) {
+        return ResponseHelper.buildResponse(iOrgUsrService.deleteFirefighterPeopleById(id,type));
     }
 /**
  *

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

@@ -241,7 +241,7 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 
 		OrgPersonDto orgPersonDto = new OrgPersonDto();
 		BeanUtils.copyProperties(orgUsr, orgPersonDto);
-		List<DynamicFormInstance> dynamicFormInstances = orgUsrService.dynamicFormColumn(peopleInfoDto.getFirefighters(), false);
+		List<DynamicFormInstance> dynamicFormInstances = orgUsrService.dynamicFormColumn(peopleInfoDto, false);
 		orgPersonDto.setDynamicFormValue(dynamicFormInstances);
 		try {
 			orgUsrService.updateByIdOrgPerson(orgPersonDto, id);

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

@@ -1085,11 +1085,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		} else {
 			orgUsr.setBizOrgCode(getOrgCodeStr());
 		}
-
-		if (!ObjectUtils.isEmpty(OrgPersonVo.getAmosOrgId())) {
-			AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
-			OrgPersonVo.setAmosOrgCode(user.getRealName());
-		}
+//已在前面对此字段赋值 废弃
+//		if (!ObjectUtils.isEmpty(OrgPersonVo.getAmosOrgId())) {
+//			AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
+//			OrgPersonVo.setAmosOrgCode(user.getRealName());
+//		}
 
 		return saveOrgUsrDynamicFormInstance(orgUsr, OrgPersonVo.getDynamicFormValue());
 	}
@@ -2989,7 +2989,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		OrgUsr orgUsr = peopleSaveOrgUsr(peopleInfoDto.getFirefighters());
 
 		// 2.保存cb_dynamic_form_instance表 人员基本信息
-		OrgUsrDto orgUsrDto = saveDynamicformInstance(orgUsr, peopleInfoDto.getFirefighters());
+		OrgUsrDto orgUsrDto = saveDynamicformInstance(orgUsr, peopleInfoDto);
 		Long sequenceNbr = orgUsrDto.getSequenceNbr();
 		if (!ObjectUtils.isEmpty(sequenceNbr)) {
 			peopleInfoDto.getFirefightersContacts().setOrgUsrId(sequenceNbr.toString());
@@ -3039,21 +3039,21 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return orgUsr;
 	}
 
-	private OrgUsrDto saveDynamicformInstance(OrgUsr orgUsr, PeopleBasicInfoDto peopleBasicInfoDto) {
-		List<DynamicFormInstance> dynamicFormInstancelist = dynamicFormColumn(peopleBasicInfoDto, true);
+	private OrgUsrDto saveDynamicformInstance(OrgUsr orgUsr,PeopleInfoDto peopleInfoDto) {
+		List<DynamicFormInstance> dynamicFormInstancelist = dynamicFormColumn(peopleInfoDto, true);
 		return  saveOrgUsrDynamicFormInstance(orgUsr, dynamicFormInstancelist);
 	}
 
-	public List<DynamicFormInstance> dynamicFormColumn(PeopleBasicInfoDto peopleBasicInfoDto, boolean flag){
+	public List<DynamicFormInstance> dynamicFormColumn(PeopleInfoDto peopleInfoDto, boolean flag){
 		// 动态字段填充
 		List<DynamicFormInitDto> dynamicFormColumn = dynamicFormColumnServiceImpl.getFormlist("246");
 		Map<String, Object> map = new HashMap<>();
 		// 获取对象属性和值
-		Field[] fields = peopleBasicInfoDto.getClass().getDeclaredFields();
+		Field[] fields = peopleInfoDto.getFirefighters().getClass().getDeclaredFields();
 		for (Field field : fields) {
 			try{
 				field.setAccessible(true);
-				Object value = field.get(peopleBasicInfoDto);
+				Object value = field.get(peopleInfoDto.getFirefighters());
 				String name = field.getName();
 				map.put(name, value);
 			}	catch (Exception ex){
@@ -3067,6 +3067,15 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			dynamicFormValue.add(DynamicFormInitDto.getFormItemDescr());
 		});
 
+		FirefightersPost firefightersPost = peopleInfoDto.getPostEduDtoObj().getFirefightersPost();
+		PeopleBasicInfoDto firefighters = peopleInfoDto.getFirefighters();
+		String s2 = JSONObject.toJSONString(firefighters);
+		Map map2 = JSONObject.parseObject(s2, Map.class);
+
+		String s = JSONObject.toJSONString(firefightersPost);
+		Map map1 = JSONObject.parseObject(s, Map.class);
+		map1.putAll(map2);
+
 		dynamicFormValue.forEach(dynamicFormInstanceDto -> {
 			String key = dynamicFormInstanceDto.getFieldCode();
 			Object value = map.get(key);
@@ -3100,10 +3109,34 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			}
 			DynamicFormInstance dynamicFormInstance = new DynamicFormInstance();
 			BeanUtils.copyProperties(dynamicFormInstanceDto, dynamicFormInstance);
-			// 修改bug 8364
 			if ("gender".equals(dynamicFormInstance.getFieldCode())){
 				dynamicFormInstance.setFieldValueLabel("346".equals(String.valueOf(dynamicFormInstance.getFieldValue()))?"男":"女");
 			}
+			if ("peopleType".equals(dynamicFormInstance.getFieldCode()) && dynamicFormInstance.getFieldValue() != null){
+				dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(dynamicFormInstance.getFieldValue()).getName());
+			}
+			if ("positionType".equals(dynamicFormInstance.getFieldCode()) && peopleInfoDto.getFirefighters().getJobTitleCode() != null){
+				dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(peopleInfoDto.getFirefighters().getJobTitleCode()).getName());
+			}
+			if ("administrativePositionCode".equals(dynamicFormInstance.getFieldCode()) && firefightersPost.getAdministrativePositionCode() != null){
+				dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(map1.get("administrativePositionCode").toString()).getName());
+			}
+			String fieldCode = dynamicFormInstance.getFieldCode();
+			if ("auditCycle".equals(dynamicFormInstance.getFieldCode())  && dynamicFormInstance.getFieldValue() != null){
+				dynamicFormInstance.setFieldValue(map1.get(fieldCode).toString());
+				dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(dynamicFormInstance.getFieldValue()).getName());
+			}
+			if ("certificateType".equals(dynamicFormInstance.getFieldCode())){
+				dynamicFormInstance.setFieldValue(map1.get(fieldCode) == null ? "" :map1.get(fieldCode).toString());
+				dynamicFormInstance.setFieldValueLabel(map1.get("certificateTypeCode") == null ? "":map1.get("certificateTypeCode").toString());
+			}
+			if (map1.containsKey(fieldCode) && fieldCode.contains("Code") ){
+				dynamicFormInstance.setFieldValue(map1.get(fieldCode) == null ? "" :map1.get(fieldCode).toString());
+			}
+			if (map1.containsKey(fieldCode.substring(0,fieldCode.length()-4))){
+				dynamicFormInstance.setFieldValueLabel(map1.get(fieldCode.substring(0,fieldCode.length()-4)).toString());
+			}
+
 			dynamicFormInstancelist.add(dynamicFormInstance);
 		});
 
@@ -3403,13 +3436,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public String deleteFirefighterPeopleById(Long id) {
+	public String deleteFirefighterPeopleById(Long id,String type) {
 		String flag = deleteFirefighters(id);
 		// 基础信息人员类型修改为非消防
 		UpdateWrapper<DynamicFormInstance> updateWrapper = new UpdateWrapper<>();
 		updateWrapper.eq("instance_id", id);
 		updateWrapper.eq("field_code", "peopleType");
-		updateWrapper.set("field_value", "1");
+		updateWrapper.set("field_value", type);
 		if ("0".equals(flag)) {
 			dynamicFormInstanceService.update(updateWrapper);
 		}