提交误改的代码

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DutyPersonShiftMapper.xml

@@ -136,7 +136,7 @@
 	</select>
 
 	<select id='getEquipmentForSpecifyDate' resultType='map'>
-
+select * from (
 		SELECT
 			MAX(
 		CASE
@@ -173,8 +173,10 @@
 		where cd.group_code =#{groupCode} and cds.instance_id is not null and
 		cd.is_delete=0
 		group by cd.instance_id
-
-
+) result 
+		<if test="groupByName != null and  groupByName!='' ">
+			group by ${groupByName}
+		</if>
 	</select>
 	<select id='getInstanceIdForSpecifyDateAndEquipment'
 		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/DutyCarServiceImpl.java

@@ -228,7 +228,7 @@ public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCa
     @Override
 	public int getDutyCarCount(Long carId) {
 		List<Map<String, Object>> equipmentList = dutyPersonShiftMapper.getEquipmentForSpecifyDate(DateUtils.getDateNowShortStr(),
-				this.getGroupCode(), "carId", "carName", "teamName","result.carId");
+				this.getGroupCode(), "carId", "carName", "teamName","");
 		int count =0;
 		for (Map<String, Object> map : equipmentList) {
 			if(map.containsKey("carId") && map.get("carId").equals(Long.toString(carId))) {