Merge branch 'dev' of http://192.168.1.43:3000/v2/zd-parents into dev

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpTaskDetail.java

@@ -13,7 +13,7 @@ import java.util.Date;
 
 /**
  * 【请填写功能名称】对象 qp_task_detail
- * 
+ *
  * @author zd
  * @date 2022-05-11
  */
@@ -86,31 +86,34 @@ public class QpTaskDetail extends BaseEntity
     @ApiModelProperty(value = "处理时间")
     private Date disposeTime;
 
-    public void setId(Long id) 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date disposeTime2;
+
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
 
-    public void setTaskId(Long taskId) 
+    public void setTaskId(Long taskId)
     {
         this.taskId = taskId;
     }
 
-    public Long getTaskId() 
+    public Long getTaskId()
     {
         return taskId;
     }
-    public void setBottleNumber(Long bottleNumber) 
+    public void setBottleNumber(Long bottleNumber)
     {
         this.bottleNumber = bottleNumber;
     }
 
-    public Long getBottleNumber() 
+    public Long getBottleNumber()
     {
         return bottleNumber;
     }

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpTaskDetailMapper.xml

@@ -47,7 +47,7 @@
 
 
     <sql id="selectQpTaskDetailVo">
-        select id, air_bottle_config_id, task_id, bottle_number, qp_status, apply_describe, supplier_id, car_id, car_number, transport_id, transport_name, is_dispose, dispose_user, dispose_userid, dispose_time, create_time from qp_task_detail
+        select id, air_bottle_config_id, task_id, bottle_number, qp_status, apply_describe, supplier_id, car_id, car_number, transport_id, transport_name, is_dispose, dispose_user, dispose_userid, dispose_time, dispose_time disposeTime2, create_time from qp_task_detail
     </sql>
 
     <sql id="selectQpTaskDetailListVo">
@@ -312,4 +312,4 @@
         ORDER BY t.back_time desc
     </select>
 
-</mapper>
+</mapper>

zd-modules/zd-algorithm/src/main/java/com/zd/alg/speaker/controller/SpeakerController.java

@@ -230,7 +230,7 @@ public class SpeakerController {
      * @param playNum 播放次数
      * @return
      */
-    @PostMapping("/textParseUrlAppIps")
+    @PostMapping("/textMoreParseUrlAppIps")
     @ApiOperation(value = "文字转语音小程序播放地址", notes = "文字转语音小程序播放地址")
     public AjaxResult textParseUrlAppIps(@RequestParam(required = true) String text,@RequestBody List<PlayVo> playVo,Integer playNum) {
         if(StringUtils.isEmpty(text) || playVo.size()==0){

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabCheckRecordReleaseMapper.xml

@@ -130,10 +130,10 @@
         LEFT JOIN   sys_dept d on   rr.dept_id=d.dept_id
         LEFT JOIN sys_user u on  rr.user_id=u.user_id where 1=1
         <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
-            and rr.create_time &gt;= str_to_date(#{beginTime},'%Y-%m-%d')
+            and DATE_FORMAT(rr.create_time,'%Y-%m-%d') &gt;= str_to_date(#{beginTime},'%Y-%m-%d')
         </if>
         <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
-            and rr.create_time &lt;= str_to_date(#{endTime},'%Y-%m-%d')
+            and DATE_FORMAT(rr.create_time,'%Y-%m-%d') &lt;= str_to_date(#{endTime},'%Y-%m-%d')
         </if>
         <if test="releaseDescribe != null  and releaseDescribe != ''">
          and rr.release_describe like concat('%', #{releaseDescribe}, '%')