修改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-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -435,14 +435,10 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
         max(case field_code when 'politicalOutlook' then field_value end)                     politicalOutlook,
         max(case field_code when 'residenceDetailsCode' then field_value_label end)                     residenceDetails,
         max(case field_code when 'residenceDetailVal' then field_value end)                     residenceDetailVal,
-
         max(case field_code when 'holdingTime' then field_value end)                     holdingTime,
         max(case field_code when 'peopleType' then field_value_label end)                     peopleTypecode,
-
-
         max(case field_code when 'airportAccommodation' then field_value end)                     airportAccommodation
         FROM cb_dynamic_form_instance GROUP BY instance_id) b
-
         on b.instance_id=a.sequence_nbr
         LEFT JOIN cb_firefighters_contacts fc ON a.sequence_nbr = fc.org_usr_id
         LEFT JOIN cb_firefighters_workexperience fw ON a.sequence_nbr = fw.org_usr_id

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

@@ -428,10 +428,10 @@ public class OrgPersonController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/people/firefighter/{id}", method = RequestMethod.DELETE)
+    @RequestMapping(value = "/people/firefighter/{id}/{type}", 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/DutyCommonServiceImpl.java

@@ -99,6 +99,9 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 		return iPage;
 	}
 
+
+
+
 	//120系统迁移接口 sql固定查询急救科下值班人员
 	@Override
 	public List<Map<String, Object>> listOnDutyPersonByAid() {
@@ -664,6 +667,8 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 				RequestContext.getAppKey(), groupCode, params);
 	}
 
+
+
 	@Override
 	public List<Map<String, Object>> listOnDutyPerson() {
 		String groupCode = this.getGroupCode();
@@ -685,14 +690,45 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 			List<Map<String, Object>> orgUsrList = orgUsrService.selectForShowByListId(ids);
 			maps.forEach(item -> {
 				String userId = String.valueOf(item.get("userId"));
+				//此处是用来给119日常值班首页值班岗位排序用
+				String sort = "";
+				switch (item.get("postType").toString()) {
+					case "826":
+						sort = "4";
+						break;
+					case "824":
+						sort = "3";
+						break;
+					case "825":
+						sort = "2";
+						break;
+					case "827":
+						sort = "1";
+						break;
+				}
+				item.put("postSort", sort);
 				for (Map<String, Object> usr : orgUsrList) {
 					if (userId.equals(String.valueOf(usr.get("sequenceNbr")))) {
 						item.put("personImg", usr.get("personImg"));
 						item.put("telephone", usr.get("telephone"));
+						item.put("companyId", usr.get("companyId"));
+						item.put("bizOrgType", usr.get("bizOrgType"));
+						item.put("parentId", usr.get("parentId"));
 						break;
 					}
 				}
 			});
+			maps = maps.stream().sorted((map1, map2) -> {
+				if (map1.get("companyId").toString().equals(map2.get("companyId").toString())) {
+					if (map1.get("deptId").toString().equals(map2.get("deptId").toString())) {
+						return map2.get("postSort").toString().compareTo(map1.get("postSort").toString());
+					} else {
+						return map1.get("deptId").toString().compareTo(map2.get("deptId").toString());
+					}
+				} else {
+					return map2.get("companyId").toString().compareTo(map1.get("companyId").toString());
+				}
+			}).collect(Collectors.toList());
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

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

@@ -90,7 +90,7 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 		}
 		if (ObjectUtils.isNotEmpty(firefighter.getNativePlace())) {
 			FeignClientResult<RegionModel> nativePlace = Systemctl.regionClient
-					.getRegion(Long.parseLong(firefighter.getNativePlace()));
+					.getRegion(Long.parseLong(firefighter.getNativePlaceCode()));
 			firefighter.setNativePlaceValue(nativePlace.getResult().getRegionName());
 		}
 		save(firefighter);
@@ -236,10 +236,10 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 			peopleInfoDto.getFirefighters().setAmosName(null);
 		}
 		OrgUsr orgUsr = orgUsrService.peopleSaveOrgUsr(peopleInfoDto.getFirefighters());
-
+		ifirefightersContactsService.updateById(peopleInfoDto.getFirefightersContacts());
 		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

@@ -36,6 +36,7 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.codehaus.jettison.json.JSONString;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -1075,11 +1076,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		} else {
 			orgUsr.setBizOrgCode(getOrgCodeStr());
 		}
-
-		if (!ObjectUtils.isEmpty(OrgPersonVo.getAmosOrgId())) {
+		//已在前面对此字段赋值 废弃
+	/*	if (!ObjectUtils.isEmpty(OrgPersonVo.getAmosOrgId())) {
 			AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
 			OrgPersonVo.setAmosOrgCode(user.getRealName());
-		}
+		}*/
 
 		return saveOrgUsrDynamicFormInstance(orgUsr, OrgPersonVo.getDynamicFormValue());
 	}
@@ -2993,7 +2994,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);
 
 		if (!ObjectUtils.isEmpty(orgUsrDto.getSequenceNbr())) {
 			peopleInfoDto.getFirefightersContacts().setOrgUsrId(orgUsrDto.getSequenceNbr().toString());
@@ -3035,21 +3036,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){
@@ -3063,6 +3064,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			dynamicFormValue.add(DynamicFormInitDto.getFormItemDescr());
 		});
 
+		FirefightersPost firefightersPost = peopleInfoDto.getPostEduDtoObj().getFirefightersPost();
+		String s = JSONObject.toJSONString(firefightersPost);
+		Map map1 = JSONObject.parseObject(s, Map.class);
+
 		dynamicFormValue.forEach(dynamicFormInstanceDto -> {
 			String key = dynamicFormInstanceDto.getFieldCode();
 			Object value = map.get(key);
@@ -3084,7 +3089,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 						}
 					}
 				}
-
 				if ("birthdayTime".equals(key)) {
 					SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 					try {
@@ -3096,10 +3100,22 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 				}
 			}
 			DynamicFormInstance dynamicFormInstance = new DynamicFormInstance();
+			BeanUtils.copyProperties(dynamicFormInstanceDto, dynamicFormInstance);
 			if ("gender".equals(dynamicFormInstance.getFieldCode())){
 				dynamicFormInstance.setFieldValueLabel("346".equals(String.valueOf(dynamicFormInstance.getFieldValue()))?"男":"女");
 			}
-			BeanUtils.copyProperties(dynamicFormInstanceDto, dynamicFormInstance);
+			if ("peopleType".equals(dynamicFormInstance.getFieldCode())){
+				dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(dynamicFormInstance.getFieldValue()).getName());
+			}
+
+			String fieldCode = dynamicFormInstance.getFieldCode();
+			if (map1.containsKey(fieldCode) && fieldCode.contains("Code") ){
+				dynamicFormInstance.setFieldValue(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);
 		});
 
@@ -3267,7 +3283,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	@Transactional(rollbackFor = Exception.class)
 	public String deletePeopleById(Long id, String type, AgencyUserModel user) {
 
-		if ("2".equals(type)) {
+		if ("1601".equals(type)) {
 			QueryWrapper<Firefighters> firefightersQueryWrapper = new QueryWrapper<>();
 			Firefighters firefighters = iFirefightersService.getOne(firefightersQueryWrapper.eq("org_usr_id", id).eq("is_delete", 0));
 			Long firefightersSequenceNbr = firefighters.getSequenceNbr();
@@ -3393,13 +3409,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);
 		}

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

@@ -443,7 +443,7 @@ public class FirefightersController extends BaseController {
     @ApiOperation(httpMethod = "PUT", value = "获取人员详情", notes = "获取人员详情")
     public ResponseModel<PeopleInfoDto> updatePeopleById(@RequestBody PeopleInfoDto firefighters, @PathVariable Long id) {
         try {
-            if ("2".equals(firefighters.getFirefighters().getPeopleType())){
+            if ("1601".equals(firefighters.getFirefighters().getPeopleType())){
                 PeopleBasicInfoDto peopleBasicInfoDto = firefighters.getFirefighters();
                 Firefighters firefighter = new Firefighters();
                 BeanUtils.copyProperties(peopleBasicInfoDto, firefighter);

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

@@ -202,14 +202,14 @@ public class ExcelServiceImpl {
 			//查询已经关联的所有 用户
             Set<String> set=new HashSet();
 			List<OrgUsr> listD=orgUsrMapper.selectAmosorgCode();
-			if(listD.isEmpty()){
+			if(!listD.isEmpty()){
 				for (OrgUsr orgUsr : listD) {
 					set.add(orgUsr.getAmosOrgId());
 				}
 			}
 			userList.stream().forEach(u -> {
 
-				if(set.isEmpty()&& set.contains(u.getUserId())){
+				if(!set.isEmpty()&& set.contains(u.getUserId())){
 					//暂时不处理
 				}else{
 					OrgUsrExcelDto dd=new OrgUsrExcelDto();
@@ -341,12 +341,12 @@ public class ExcelServiceImpl {
 						null, FirefightersExcelDto.class, null, false);
 				break;
 			}
-//			List<FirefightersExcelDto> firefightersExcelDtoList = firefightersService.exportToExcel(false, par);
-			List<OrgUsrFireExcelDto> firefightersExcelDtoList = firefightersService.exportToExcelNew(false, par);
-			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
-					firefightersExcelDtoList, OrgUsrFireExcelDto.class, null, false);
+			List<FirefightersExcelDto> firefightersExcelDtoList = firefightersService.exportToExcel(false, par);
+		//	List<OrgUsrFireExcelDto> firefightersExcelDtoList = firefightersService.exportToExcelNew(false, par);
 //			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
-//					firefightersExcelDtoList, FirefightersExcelDto.class, null, false);
+//					firefightersExcelDtoList, OrgUsrFireExcelDto.class, null, false);
+			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
+					firefightersExcelDtoList, FirefightersExcelDto.class, null, false);
 			break;
 		case "WBRY":
 			List<MaintenancePersonExcleDto> maintenancePersonExcelDtoList = maintenanceCompanyService
@@ -821,6 +821,8 @@ public class ExcelServiceImpl {
 					}
 				}
 
+				String s = JSONObject.toJSONString(orgUsrExcelDto);
+				Map map1 = JSONObject.parseObject(s, Map.class);
 				List<DynamicFormInstanceDto> dynamicFormValue = new ArrayList<>();
 				List<DynamicFormInstance> dynamicFormInstancelist = new ArrayList<>();
 
@@ -856,6 +858,19 @@ public class ExcelServiceImpl {
 
 					DynamicFormInstance dynamicFormInstance = new DynamicFormInstance();
 					BeanUtils.copyProperties(dynamicFormInstanceDto, dynamicFormInstance);
+					if ("gender".equals(dynamicFormInstance.getFieldCode())){
+						dynamicFormInstance.setFieldValueLabel("346".equals(String.valueOf(dynamicFormInstance.getFieldValue()))?"男":"女");
+					}
+					String fieldCode = dynamicFormInstance.getFieldCode();
+					if (map1.containsKey(fieldCode) && fieldCode.contains("Code") ){
+						String[] split = map1.get(fieldCode).toString().split("@");
+						dynamicFormInstance.setFieldValue(split[0]);
+					}
+
+					if (map1.containsKey(fieldCode.substring(0,fieldCode.length()-4))){
+						dynamicFormInstance.setFieldValueLabel(map1.get(fieldCode.substring(0,fieldCode.length()-4)).toString());
+					}
+
 					dynamicFormInstancelist.add(dynamicFormInstance);
 				});
 
@@ -880,6 +895,7 @@ public class ExcelServiceImpl {
 						savePeopleItem(orgUsrExcelDto);
 					}
 				} catch (Exception e) {
+					e.printStackTrace();
 					throw new RuntimeException("导入失败!");
 				}
 			});
@@ -1458,13 +1474,11 @@ public class ExcelServiceImpl {
 	private void excelImportFireExperts(MultipartFile multipartFile) throws Exception {
 		ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
 		String companyId = reginParams.getPersonIdentity().getCompanyId();
-		String bizOrgCode = "1";
-		String bizOrgName = "1";
-		if (org.apache.commons.lang3.StringUtils.isNotEmpty(companyId)) {
-			OrgUsr orgUsr = orgUsrMapper.queryBySequenceNbr(companyId);
-			bizOrgCode = orgUsr.getBizOrgCode();
-			bizOrgName = orgUsr.getBizOrgName();
-		}
+	//	String bizOrgCode = "1";
+	//	String bizOrgName = "1"; 此处代码无意义 且容易造成数据问题 暂时先赋值 当前登录人所在部门或公司
+		String bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
+		String bizOrgName = reginParams.getPersonIdentity().getCompanyName();
+
 		List<FireExpertsDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, FireExpertsDto.class, 1);
 		List<FireExperts> excelEntityList = new ArrayList<>();
 		String finalBizOrgCode = bizOrgCode;
@@ -1478,6 +1492,12 @@ public class ExcelServiceImpl {
 				fireExperts.setCertificatesType(certificates[0]);
 				fireExperts.setCertificatesTypeCode(certificates[1]);
 			}
+			if (StringUtils.isEmpty(fireExperts.getCertificatesNum())) {
+				throw new BadRequest("导入身份证号码不可为空");
+			}
+			if (StringUtils.isEmpty(fireExperts.getMobilePhone())) {
+				throw new BadRequest("导入移动号码不可为空");
+			}
 			if (fireExperts.getJobs() != null) {
 				String[] jobs = fireExperts.getJobs().split("@");
 				fireExperts.setJobs(jobs[0]);
@@ -1487,6 +1507,8 @@ public class ExcelServiceImpl {
 				String[] expert = fireExperts.getExpert().split("@");
 				fireExperts.setExpert(expert[0]);
 				fireExperts.setExpertCode(expert[1]);
+			}else {
+				throw new BadRequest("消防专家领域不可为空");
 			}
 			if (fireExperts.getHighestEducation() != null) {
 				String[] highestEducation = fireExperts.getHighestEducation().split("@");

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

 package com.yeejoin.amos.patrol.business.controller;
 
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
 import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
@@ -22,6 +23,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import javax.persistence.Column;
 import java.util.*;
@@ -139,6 +141,12 @@ public class PlanController extends AbstractBaseController {
     @RequestMapping(value = "/addPlan", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse checkPlanAdd(@ApiParam(value = "巡检计划", required = true) @RequestBody Plan param) {
         try {
+
+
+            if ( param.getDayBegin().getTime()> param.getDayEnd().getTime()){
+                throw new BadRequest("开始时间不能大于结束时间");
+            }
+
             String userId = getUserId();
             ReginParams reginParams = getSelectedOrgInfo();
             String loginOrgCode = getOrgCode(reginParams);

amos-boot-system-patrol/src/main/resources/application.properties

@@ -28,8 +28,8 @@ mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 
 equip.fegin.name=AMOS-EQUIPMANAGE
 equip.fegin.prefix=/equip
-input.custom.prefix = QYZD
-input.statute.prefix = FG
+input.custom.prefix =
+input.statute.prefix =
 
 
 Security.fegin.name=AMOS-API-PRIVILEGE