修改bug

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

@@ -7,6 +7,8 @@ import javax.servlet.http.HttpServletRequest;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.module.common.api.entity.*;
 import com.yeejoin.amos.boot.module.common.api.enums.ExceptionEnum;
+import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IDynamicFormInstanceService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -101,6 +103,8 @@ public class FirefightersController extends BaseController {
     RedisUtils redisUtils;
     @Autowired
     DataDictionaryServiceImpl dataDictionaryService;
+    @Autowired
+    DynamicFormInstanceMapper dynamicFormInstanceMapper;
 
     @Value("${redis.cache.failure.time}")
     private long time;
@@ -485,6 +489,17 @@ public class FirefightersController extends BaseController {
                     }
                     iFirefightersService.updateById(firefighter);
                     ifirefightersContactsService.updateById(firefighters.getFirefightersContacts());
+
+                    QueryWrapper<DynamicFormInstance> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("group_code", OrgPersonEnum.人员.getCode());
+                    queryWrapper.eq("field_code", "peopleType");
+                    queryWrapper.eq("instance_id", id);
+                    DynamicFormInstance instance = dynamicFormInstanceMapper.selectOne(queryWrapper);
+                    if (!ObjectUtils.isEmpty(instance)) {
+                        instance.setFieldValue(firefighters.getFirefighters().getPeopleType());
+                        dynamicFormInstanceMapper.updateById(instance);
+                    }
+
                     // 删除缓存
                     redisUtils.del(RedisKey.FIREFIGHTERS_ID + firefighter.getSequenceNbr(),
                             RedisKey.FIREFIGHTERS_LIST_ID + firefighter.getSequenceNbr());

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java

@@ -1509,7 +1509,7 @@ public class CheckServiceImpl implements ICheckService {
         List<HashMap<String,Object>>  equipList= checkMapper.getCheckEquipByCheckID(param.getCheckID());
         equipList.forEach(equip->{
             param.setClassifyId(equip.get("classifyId").toString());
-            equip.put("IsOK",PointStatusEnum.QUALIFIED.getName());
+            equip.put("IsOK", equip.get("IsOK"));
             List<HashMap<String,Object>> inputContent = checkMapper.getEquipInputByCheckId(param);
             List<HashMap<String,Object>> imgContent = checkMapper.getEquipInfoImgsByCheckIdsList(param.getCheckID());
 //            String ipPort = "http://" + fileIp + ":" + filePort + "/";