修改接口

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,7 +69,7 @@ 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> getCarUserNum(@Param("id") Long id);
 
 
     Map<String, Integer> getCompanyNum(@Param("id") Long id);

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

@@ -146,48 +146,61 @@
 
 
     <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'
+--        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}
+--         )
 
-		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
+        SUM(c.car_user) num
         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>
 

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

@@ -702,11 +702,13 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 
 
 
-		Date currentTime = new Date();
-		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
-		String dateString = formatter.format(currentTime);
+//		Date currentTime = new Date();
+//		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+//		String dateString = formatter.format(currentTime);
+
+		Map<String, Integer> list=powerTransferMapper.getCarUserNum(id);
+
 
-		List< Map<String, Integer>> list=powerTransferMapper.getCarUserNum(dateString,id);
 
 		AlertCalled al=alertCalledMapper.selectById(id);
 
@@ -716,7 +718,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 //			listdate.add(new KeyValueLabel("调动人力", "useNum", "0", "人"));
 //		}
 		if(list!=null&&list.size()>0){
-			listdate.add(new KeyValueLabel("调动人力", "useNum", list.size(), "人"));
+			listdate.add(new KeyValueLabel("调动人力", "useNum", list.get("num"), "人"));
 		}else{
 			listdate.add(new KeyValueLabel("调动人力", "useNum", "0", "人"));
 		}

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

@@ -481,16 +481,18 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
                 List<Map<String, Object>> equipmentList = iDutyCarService.getDutyCaruser(Long.valueOf(powerTransferCompanyResources.getResourcesId()));
 
                 if (!ValidationUtil.isEmpty(equipmentList)) {
-                    String str = "";
-                    String newStr = "";
-                    for (int i = 0; i < equipmentList.size(); i++) {
-                        if (i == equipmentList.size() - 1) {
-                            newStr =newStr+ str.concat(equipmentList.get(i).get("userName") + "");
-                        } else {
-                            newStr = newStr+str.concat(equipmentList.get(i).get("userName") + ",");
-                        }
-                    }
-                    powerTransferCompanyResources.setCarUser(newStr);
+//                    String str = "";
+//                    String newStr = "";
+//                    for (int i = 0; i < equipmentList.size(); i++) {
+//                        if (i == equipmentList.size() - 1) {
+//                            newStr =newStr+ str.concat(equipmentList.get(i).get("userName") + "");
+//                        } else {
+//                            newStr = newStr+str.concat(equipmentList.get(i).get("userName") + ",");
+//                        }
+//                    }
+                    powerTransferCompanyResources.setCarUser(equipmentList.size()+"");
+                }else{
+                    powerTransferCompanyResources.setCarUser("0");
                 }
 
                 powerTransferCompanyResourcesList.add(powerTransferCompanyResources);