中心级附码BUG

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/FireResourceSupervisionMapper.xml

@@ -40,7 +40,7 @@
         FROM cb_sign cs
         WHERE cs.date = date_format(now(), '%Y-%m-%d')
           AND cs.is_delete = FALSE
-          AND cs.org_code like concat(#{bizOrgCode}, '%')
+          AND cs.biz_org_code like concat(#{bizOrgCode}, '%')
     </select>
 
     <select id="getZzPersonNum" resultType="Map">

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

@@ -3697,11 +3697,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 					contentVo.setValue(peopleInfoDto.getFirefighters().getAmosName());
 					contentVo.setType("text");
 					break;
-				case "state":
-					contentVo.setLabel(u.getDescribe());
-					contentVo.setValue(peopleInfoDto.getFirefighters().getState());
-					contentVo.setType("text");
-					break;
 				case "birthdayTime":
 					contentVo.setLabel(u.getDescribe());
 					try {

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipInformationCardController.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.equipmanage.common.entity.EquipQrcodeRecord;
 import com.yeejoin.equipmanage.common.enums.CheckStatusEnum;
 import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
+import com.yeejoin.equipmanage.common.utils.DateUtils;
 import com.yeejoin.equipmanage.fegin.IdxFeign;
 import com.yeejoin.equipmanage.fegin.McbFeign;
 import com.yeejoin.equipmanage.mapper.EquipQrcodeRecordMapper;
@@ -30,10 +31,8 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -74,7 +73,10 @@ public class EquipInformationCardController {
             page = equipmentSpecificMapper.selectListByPatrolCheck(page, equipmentId);
             if (0 < page.getRecords().size()) {
                 list = page.getRecords();
-                list.stream().forEach(e->e.put("is_ok", CheckStatusEnum.getNameByCode(e.get("is_ok").toString())));
+                list.stream().forEach(e->{
+                    e.put("is_ok", CheckStatusEnum.getNameByCode(e.get("is_ok").toString()));
+                    e.put("create_date", e.get("create_date").toString().replace("T"," "));
+                });
             }
         }
         String ids = list.stream().map(map1 -> map1.get("id").toString()).collect(Collectors.joining(","));

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/RiskSourceServiceImpl.java

@@ -126,7 +126,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         }
         equipInfoVo.setId(equipmentSpecId);
 
-        if (StringUtil.isNotEmpty(equipmentSpecId) && !source.equalsIgnoreCase(RiskSourceTypeEnum.PATROL.getName())) {
+        if (StringUtil.isNotEmpty(equipmentSpecId)) {
             EquipmentSpecific specific = equipmentSpecificMapper.selectById(equipmentSpecId);
             equipInfoVo.setPosition(specific.getPosition());
             equipInfoVo.setManufacturerName(getEquipmentDetailInfo(specific.getEquipmentDetailId()).getManufacturerName());
@@ -149,7 +149,11 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             m.put("equipSpeId", equipmentSpecId);
             m.put("checkEquipName", specific.getName());
             m.put("equipPosition", specific.getPosition());
+        } else {
+
         }
+
+
         detailVo.setEquipInfo(equipInfoVo);
         detailVo.setAlarmInfo(equipAlarm);