Merge branch 'develop_dl_plan6_temp' of…

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

@@ -37,7 +37,7 @@ public interface IFirefightersService {
 
     BigScreen1VO getFireForceInfoByCode(String companyCode);
 
-    String getCompanyName(String bizOrgCode);
+    Map<String,Object> getCompanyName(String bizOrgCode);
 
     List<Map<String, Object>> getUserInfoByYJYA(String bizOrgCode);
 }

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

@@ -331,26 +331,32 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 	}
 
 	@Override
-	public String getCompanyName(String bizOrgCode) {
+	public Map<String,Object> getCompanyName(String bizOrgCode) {
 		LambdaQueryWrapper<OrgUsr> lambda = new QueryWrapper<OrgUsr>().lambda();
 		lambda.eq(OrgUsr::getBizOrgCode, bizOrgCode);
 		lambda.eq(OrgUsr::getIsDelete, false);
 		OrgUsr orgUsr = orgUsrMapper.selectList(lambda).get(0);
 		if (!ObjectUtils.isEmpty(orgUsr.getBizOrgType()) && "COMPANY".equals(orgUsr.getBizOrgType())) {
-			return orgUsr.getBizOrgName();
+			Map<String,Object> map = new HashMap<>();
+			map.put("bizOrgCode",orgUsr.getBizOrgCode());
+			map.put("bizOrgName",orgUsr.getBizOrgName());
+			return map;
 		} else {
 			return getCompanyNameById(orgUsr.getParentId());
 		}
 
 	}
 
-	private String getCompanyNameById(String id) {
+	private Map<String,Object> getCompanyNameById(String id) {
 		LambdaQueryWrapper<OrgUsr> lambda = new QueryWrapper<OrgUsr>().lambda();
 		lambda.eq(OrgUsr::getSequenceNbr, id);
 		lambda.eq(OrgUsr::getIsDelete, false);
 		OrgUsr orgUsr = orgUsrMapper.selectList(lambda).get(0);
 		if (!ObjectUtils.isEmpty(orgUsr.getBizOrgType()) && "COMPANY".equals(orgUsr.getBizOrgType())) {
-			return orgUsr.getBizOrgName();
+			Map<String,Object> map = new HashMap<>();
+			map.put("bizOrgCode",orgUsr.getBizOrgCode());
+			map.put("bizOrgName",orgUsr.getBizOrgName());
+			return map;
 		} else {
 			return getCompanyNameById(orgUsr.getParentId());
 		}

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

@@ -524,19 +524,19 @@ public class FirefightersController extends BaseController {
 //            firefightersQueryWrapper2.eq("amos_user_id",reginParam.getUserModel().getUserId());
 //            Firefighters one = iFirefightersService.getOne(firefightersQueryWrapper2);
             List<Map<String,Object>> list = new ArrayList<>();
+            Map<String,Object> bizOrgCodeAndBizOrgName = iFirefightersService.getCompanyName(bizOrgCode);
 
             QueryWrapper<Firefighters> firefightersQueryWrapper1 = new QueryWrapper<>();
-            firefightersQueryWrapper1.like("biz_org_code", bizOrgCode);
+            firefightersQueryWrapper1.like("biz_org_code", bizOrgCodeAndBizOrgName.get("bizOrgCode"));
             firefightersQueryWrapper1.eq("people_type", "1601");
             firefightersQueryWrapper1.eq("is_delete", "0");
-            String companyName = iFirefightersService.getCompanyName(bizOrgCode);
             List<Firefighters> firefighters = iFirefightersService.getBaseMapper().selectList(firefightersQueryWrapper1);
             firefighters.stream().forEach(e -> {
                 Map<String, Object> map = new HashMap<>();
                 map.put("name", e.getName());
                 map.put("jobTitle", e.getJobTitle());
-                map.put("bizOrgName", companyName);
-                map.put("bizOrgCode", bizOrgCode);
+                map.put("bizOrgName", bizOrgCodeAndBizOrgName.get("bizOrgName"));
+                map.put("bizOrgCode", bizOrgCodeAndBizOrgName.get("bizOrgCode"));
                 map.put("amosUserId", e.getOrgUsrId());
                 map.put("personnelPhotos", e.getPersonnelPhotos());
                 list.add(map);

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.SinStaticDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Sign;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.SignMapper;
@@ -26,6 +27,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.text.NumberFormat;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 打卡记录服务实现类
@@ -46,6 +48,8 @@ public class SignServiceImpl extends BaseService<SignDto,Sign,SignMapper> implem
     @Value("${mqtt.topic.person.sign.zxj:sign/data/synZxj}")
     private String personSignZxj;
 
+    @Autowired
+    FirefightersServiceImpl iFirefightersService;
     /**
      * 分页查询
      */
@@ -120,7 +124,8 @@ public class SignServiceImpl extends BaseService<SignDto,Sign,SignMapper> implem
     @Override
     public Boolean saveSign(SignDto dot) {
         Sign sign = new Sign();
-        int num = this.baseMapper.queryPersonNum(dot.getBizOrgCode());
+        Map<String,Object> bizOrgCodeAndBizOrgName = iFirefightersService.getCompanyName(dot.getBizOrgCode());
+        int num = this.baseMapper.queryPersonNum(bizOrgCodeAndBizOrgName.get("bizOrgCode").toString());
         Bean.copyExistPropertis(dot,sign);
         sign.setPersonOfDay(String.valueOf(num));
         boolean save = this.save(sign);