任务 8887 8888 8890 8891

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

@@ -511,21 +511,24 @@ public class FirefightersController extends BaseController {
             fireTeamQuery.eq("company",one.getCompany());
             fireTeamQuery.eq("type_code","116");
             fireTeamQuery.eq("is_delete","0");
-            FireTeam fireTeam = iFireTeamService.getOne(fireTeamQuery);
+            List<FireTeam> fireTeam = iFireTeamService.list(fireTeamQuery);
             QueryWrapper<Firefighters> firefightersQueryWrapper1 = new QueryWrapper<>();
-            firefightersQueryWrapper1.eq("fire_team_id",fireTeam.getSequenceNbr());
-            List<Firefighters> firefighters = iFirefightersService.getBaseMapper().selectList(firefightersQueryWrapper1);
             List<Map<String,Object>> list = new ArrayList<>();
-            firefighters.stream().forEach(e->{
-                Map<String,Object> map = new HashMap<>();
-                map.put("name",e.getName());
-                map.put("jobTitle",e.getJobTitle());
-                map.put("bizOrgName",e.getBizOrgName());
-                map.put("bizOrgCode",e.getBizOrgCode());
-                map.put("amosUserId",e.getAmosUserId());
-                map.put("personnelPhotos",e.getPersonnelPhotos());
-                list.add(map);
+            fireTeam.stream().forEach(r-> {
+                firefightersQueryWrapper1.eq("fire_team_id",r.getSequenceNbr());
+                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",e.getBizOrgName());
+                    map.put("bizOrgCode",e.getBizOrgCode());
+                    map.put("amosUserId",e.getAmosUserId());
+                    map.put("personnelPhotos",e.getPersonnelPhotos());
+                    list.add(map);
+                });
             });
+
             JSONObject object = new JSONObject();
             object.put("persons",list);
             return ResponseHelper.buildResponse(object);

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

@@ -180,15 +180,14 @@ public class SignController extends BaseController {
 	@ApiOperation(httpMethod = "POST",value = "保存打卡记录",   notes = "保存打卡记录")
 	@PostMapping(value = "/saveSign")
 	public ResponseModel<Boolean> hasSign(@RequestBody SignDto dto) {
-		QueryWrapper<Sign> signQueryWrapper = new QueryWrapper<>();
-		signQueryWrapper.eq("user_id",dto.getSignUserId());
-		signQueryWrapper.eq("date",dto.getDate());
-		signQueryWrapper.eq("type",dto.getType());
-		Sign one = signServiceImpl.getOne(signQueryWrapper);
-		if(null != one) {
-			return ResponseHelper.buildResponse(true);
-		}
-
+//		QueryWrapper<Sign> signQueryWrapper = new QueryWrapper<>();
+//		signQueryWrapper.eq("user_id",dto.getSignUserId());
+//		signQueryWrapper.eq("date",dto.getDate());
+//		signQueryWrapper.eq("type",dto.getType());
+//		Sign one = signServiceImpl.getOne(signQueryWrapper);
+//		if(null != one) {
+//			return ResponseHelper.buildResponse(true);
+//		}
 		return ResponseHelper.buildResponse(signServiceImpl.saveSign(dto));
 	}
 }

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -1291,24 +1291,27 @@
     (SELECT COUNT(DISTINCT(equipment_id))  FROM p_point_classify
     )  AS  total,
     (
-    SELECT count(DISTINCT(point_id))  FROM p_check WHERE org_code =#{orgCode}
-    and create_date
+    SELECT count(DISTINCT(point_id))  FROM p_check WHERE org_code like CONCAT(#{orgCode},'%')
+    and check_time
     between #{startTime} and #{endTime}
     )as pointNum,
     (
     SELECT count(DISTINCT(ppc.equipment_id))  FROM
 
     (SELECT point_classify_id  FROM  p_check_input  WHERE  point_classify_id in(SELECT id FROM p_point_classify)
-    and is_ok = 2 and org_code = #{orgCode} and create_date
+    and is_ok = 2 and org_code like CONCAT(#{orgCode},'%') and create_date
     between #{startTime} and #{endTime})
     pci
     LEFT JOIN p_point_classify ppc on pci.point_classify_id = ppc.id
     )AS unqualified,
     (
-    SELECT COUNT(DISTINCT(equipment_id))  FROM  p_point_classify
-    WHERE id not in(SELECT DISTINCT(point_classify_id) FROM p_check_input
-    WHERE org_code = #{orgCode} and create_date
-    between #{startTime} and #{endTime})
+    SELECT count(DISTINCT(ppc.equipment_id))  FROM
+
+    ( SELECT point_classify_id  FROM  p_check_input  WHERE  point_classify_id in(SELECT id FROM p_point_classify)
+        and is_ok = 3 and org_code like CONCAT(#{orgCode},'%') and create_date
+        between #{startTime} and #{endTime})
+        pci
+        LEFT JOIN p_point_classify ppc on pci.point_classify_id = ppc.id
     )AS missedCheck
     </select>
 </mapper>
\ No newline at end of file