Browse Source

20210604修改$

pt
zy_Java 4 years ago
parent
commit
ba2094c7f6
  1. 1
      recovery/src/main/java/com/ccsens/recovery/api/PatientController.java
  2. 4
      tall/src/main/resources/application.yml
  3. 4
      wisdomcar/src/main/resources/application.yml
  4. 2
      wisdomcar/src/main/resources/mapper_dao/StepTaskDao.xml

1
recovery/src/main/java/com/ccsens/recovery/api/PatientController.java

@ -111,7 +111,6 @@ public class PatientController {
return JsonResponse.newInstance().ok(recipeRecordId);
}
@MustLogin
@ApiOperation(value = "结束训练", notes = "zy:")
@RequestMapping(value = "/end", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse endDrill(@ApiParam @Validated @RequestBody QueryDto<PatientDto.EndDrill> params) {

4
tall/src/main/resources/application.yml

@ -1,5 +1,5 @@
spring:
profiles:
active: test
include: util-test,common
active: dev
include: util-dev,common

4
wisdomcar/src/main/resources/application.yml

@ -1,6 +1,6 @@
spring:
profiles:
active: test
include: common, util-test
active: dev
include: common, util-dev

2
wisdomcar/src/main/resources/mapper_dao/StepTaskDao.xml

@ -23,7 +23,7 @@
AND st.batch = st2.batch
AND st2.step_id = #{stepId}
AND pc.car_id = #{carId}
AND pc.start_time $lt;= #{time} AND pc.end_time = 0 AND pc.start_time > #{time - 2 * 60 * 60 * 1000}
AND pc.start_time &lt;= #{time} AND pc.end_time = 0 AND pc.start_time > #{time - 2 * 60 * 60 * 1000}
order by pc.created_at desc limit 1
</select>
</mapper>
Loading…
Cancel
Save