修改bug调派人数

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/PowerTransferMapper.java

@@ -69,6 +69,9 @@ public interface PowerTransferMapper extends BaseMapper<PowerTransfer> {
 
 
     Map<String, Integer> getCarNum(@Param("id") Long id);
+    List< Map<String, Integer>> getCarUserNum(@Param("dutyDate") String dutyDate,@Param("id") Long id);
+
+
     Map<String, Integer> getCompanyNum(@Param("id") Long id);
 
     List<PowerData> getPowerDataList(@Param("id") Long id);

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

@@ -145,6 +145,58 @@
     </select>
 
 
+    <select id="getCarUserNum" resultType="Map">
+select * from (
+		SELECT
+			MAX(
+		CASE
+		WHEN cd.FIELD_CODE ='carId' THEN
+			cd.FIELD_VALUE
+		END
+	) AS 'carId',
+
+		MAX(
+		CASE
+		WHEN cd.FIELD_CODE = 'userName' THEN
+		cd.FIELD_VALUE
+		END
+		) AS 'userName'
+
+		FROM
+		cb_dynamic_form_instance cd
+		LEFT JOIN (
+		SELECT
+		dp.instance_id,
+		ds.`name`
+		FROM
+		cb_duty_person_shift dp
+		LEFT JOIN cb_duty_shift ds ON dp.shift_id = ds.sequence_nbr
+		WHERE
+		dp.duty_date = #{dutyDate} and dp.is_delete=0
+		) cds ON cd.instance_id = cds.instance_id
+		where cd.group_code ='dutyCar' and cds.instance_id is not null and
+		cd.is_delete=0
+		group by cd.instance_id
+        ) result
+        where carId is not null and userName is not null and carId in (
+        SELECT
+         c.resources_id
+        FROM
+        jc_power_transfer a
+        LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
+        LEFT JOIN jc_power_transfer_company_resources c ON c.power_transfer_company_id = b.sequence_nbr
+        WHERE
+        a.alert_called_id = ${id}
+        )
+
+    </select>
+
+
+
+
+
+
+
     <select id="getCompanyNum" resultType="Map">
       select COUNT(*) companyNum from
     (SELECT DISTINCT

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

@@ -699,11 +699,31 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 		Map<String, Integer> map = powerTransferMapper.getCarNum(id);
 //		Map<String,Integer>  mapc=powerTransferMapper.getCompanyNum(id);
 //		Map<String,Integer>  mapu= alertSubmittedMapper.getUseNum(id);
+
+
+
+		Date currentTime = new Date();
+		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+		String dateString = formatter.format(currentTime);
+
+		List< Map<String, Integer>> list=powerTransferMapper.getCarUserNum(dateString,id);
+
+		AlertCalled al=alertCalledMapper.selectById(id);
+
 		// 统计参与人员
 		List<KeyValueLabel> listdate = new ArrayList<>();
+		if(al.getAlertStatus()){
+			listdate.add(new KeyValueLabel("调动人力", "useNum", "0", "人"));
+		}
+		if(list!=null&&list.size()>0){
+			listdate.add(new KeyValueLabel("调动人力", "useNum", list.size(), "人"));
+		}else{
+			listdate.add(new KeyValueLabel("调动人力", "useNum", "0", "人"));
+		}
+
 		listdate.add(new KeyValueLabel("调动人力", "useNum", "0", "人"));
 		// 统计参与车辆
-		listdate.add(new KeyValueLabel("调动人力", "carNum", map.get("carNum"), "辆"));
+		listdate.add(new KeyValueLabel("调派车辆", "carNum", map.get("carNum"), "辆/次"));
 		// 统计参与队伍
 		listdate.add(new KeyValueLabel("调动单位", "companyNum", map.get("companyNum"), "个"));
 		return listdate;