优化 日期处理方式

java110-bean/src/main/java/com/java110/po/maintainanceTaskDetail/MaintainanceTaskDetailPo.java

@@ -17,6 +17,7 @@ package com.java110.po.maintainanceTaskDetail;
 
 import java.io.Serializable;
 import java.util.Date;
+
 /**
  * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
  * add by 吴学文 at 2022-11-08 16:02:23 mail: 928255095@qq.com
@@ -28,104 +29,138 @@ import java.util.Date;
 public class MaintainanceTaskDetailPo implements Serializable {
 
     private String sendFlag;
-private String pointEndTime;
-private String inspectionTime;
-private String sortNumber;
-private String statusCd = "0";
-private String machineName;
-private String actUserName;
-private String taskDetailId;
-private String machineId;
-private String pointStartTime;
-private String state;
-private String communityId;
-private String actUserId;
-private String taskId;
-public String getSendFlag() {
+    private String pointEndTime;
+    private String inspectionTime;
+    private String sortNumber;
+    private String statusCd = "0";
+    private String machineName;
+    private String actUserName;
+    private String taskDetailId;
+    private String machineId;
+    private String pointStartTime;
+    private String state;
+    private String communityId;
+    private String actUserId;
+    private String taskId;
+    private String description;
+
+    public String getSendFlag() {
         return sendFlag;
     }
-public void setSendFlag(String sendFlag) {
+
+    public void setSendFlag(String sendFlag) {
         this.sendFlag = sendFlag;
     }
-public String getPointEndTime() {
+
+    public String getPointEndTime() {
         return pointEndTime;
     }
-public void setPointEndTime(String pointEndTime) {
+
+    public void setPointEndTime(String pointEndTime) {
         this.pointEndTime = pointEndTime;
     }
-public String getInspectionTime() {
+
+    public String getInspectionTime() {
         return inspectionTime;
     }
-public void setInspectionTime(String inspectionTime) {
+
+    public void setInspectionTime(String inspectionTime) {
         this.inspectionTime = inspectionTime;
     }
-public String getSortNumber() {
+
+    public String getSortNumber() {
         return sortNumber;
     }
-public void setSortNumber(String sortNumber) {
+
+    public void setSortNumber(String sortNumber) {
         this.sortNumber = sortNumber;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getMachineName() {
+
+    public String getMachineName() {
         return machineName;
     }
-public void setMachineName(String machineName) {
+
+    public void setMachineName(String machineName) {
         this.machineName = machineName;
     }
-public String getActUserName() {
+
+    public String getActUserName() {
         return actUserName;
     }
-public void setActUserName(String actUserName) {
+
+    public void setActUserName(String actUserName) {
         this.actUserName = actUserName;
     }
-public String getTaskDetailId() {
+
+    public String getTaskDetailId() {
         return taskDetailId;
     }
-public void setTaskDetailId(String taskDetailId) {
+
+    public void setTaskDetailId(String taskDetailId) {
         this.taskDetailId = taskDetailId;
     }
-public String getMachineId() {
+
+    public String getMachineId() {
         return machineId;
     }
-public void setMachineId(String machineId) {
+
+    public void setMachineId(String machineId) {
         this.machineId = machineId;
     }
-public String getPointStartTime() {
+
+    public String getPointStartTime() {
         return pointStartTime;
     }
-public void setPointStartTime(String pointStartTime) {
+
+    public void setPointStartTime(String pointStartTime) {
         this.pointStartTime = pointStartTime;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getActUserId() {
+
+    public String getActUserId() {
         return actUserId;
     }
-public void setActUserId(String actUserId) {
+
+    public void setActUserId(String actUserId) {
         this.actUserId = actUserId;
     }
-public String getTaskId() {
+
+    public String getTaskId() {
         return taskId;
     }
-public void setTaskId(String taskId) {
+
+    public void setTaskId(String taskId) {
         this.taskId = taskId;
     }
 
+    public String getDescription() {
+        return description;
+    }
 
-
+    public void setDescription(String description) {
+        this.description = description;
+    }
 }

java110-db/src/main/resources/mapper/community/MaintainanceTaskDetailV1ServiceDaoImplMapper.xml

@@ -115,19 +115,23 @@
         <if test="state !=null and state != ''">
             , t.state= #{state}
         </if>
+        <if test="description !=null and description != ''">
+            , t.description= #{description}
+        </if>
         <if test="communityId !=null and communityId != ''">
             , t.community_id= #{communityId}
         </if>
         <if test="actUserId !=null and actUserId != ''">
             , t.act_user_id= #{actUserId}
         </if>
-        <if test="taskId !=null and taskId != ''">
-            , t.task_id= #{taskId}
-        </if>
+
         where 1=1
         <if test="taskDetailId !=null and taskDetailId != ''">
             and t.task_detail_id= #{taskDetailId}
         </if>
+        <if test="taskId !=null and taskId != ''">
+            and t.task_id= #{taskId}
+        </if>
 
     </update>
 

service-community/src/main/java/com/java110/community/cmd/inspectionTaskDetail/ListInspectionTaskDetailsCmd.java

@@ -9,6 +9,7 @@ import com.java110.dto.file.FileRelDto;
 import com.java110.dto.inspectionPlan.InspectionTaskDetailDto;
 import com.java110.intf.common.IFileRelInnerServiceSMO;
 import com.java110.intf.community.IInspectionTaskDetailInnerServiceSMO;
+import com.java110.utils.cache.MappingCache;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.api.inspectionTaskDetail.ApiInspectionTaskDetailDataVo;
@@ -57,6 +58,7 @@ public class ListInspectionTaskDetailsCmd extends Cmd {
     private void refreshPhotos(List<ApiInspectionTaskDetailDataVo> inspectionTaskDetails) {
         List<PhotoVo> photoVos = null;
         PhotoVo photoVo = null;
+        String imgUrl = MappingCache.getValue("IMG_PATH");
         for (ApiInspectionTaskDetailDataVo inspectionTaskDetail : inspectionTaskDetails) {
             if(!"20200407".equals(inspectionTaskDetail.getState())){
                 continue;
@@ -67,7 +69,7 @@ public class ListInspectionTaskDetailsCmd extends Cmd {
             photoVos = new ArrayList<>();
             for (FileRelDto tmpFileRelDto : fileRelDtos) {
                 photoVo = new PhotoVo();
-                photoVo.setUrl(tmpFileRelDto.getFileRealName());
+                photoVo.setUrl(tmpFileRelDto.getFileRealName().startsWith("http")?tmpFileRelDto.getFileRealName():imgUrl+tmpFileRelDto.getFileRealName());
                 photoVos.add(photoVo);
             }
             inspectionTaskDetail.setPhotos(photoVos);

service-community/src/main/java/com/java110/community/cmd/maintainanceTask/ListMaintainanceTaskDetailCmd.java

@@ -23,6 +23,7 @@ import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.file.FileRelDto;
 import com.java110.intf.common.IFileRelInnerServiceSMO;
 import com.java110.intf.community.IMaintainanceTaskDetailV1InnerServiceSMO;
+import com.java110.utils.cache.MappingCache;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -92,6 +93,8 @@ public class ListMaintainanceTaskDetailCmd extends Cmd {
     private void refreshPhotos( List<MaintainanceTaskDetailDto> maintainanceTaskDetailDtos) {
         List<PhotoVo> photoVos = null;
         PhotoVo photoVo = null;
+        String imgUrl = MappingCache.getValue("IMG_PATH");
+
         for (MaintainanceTaskDetailDto inspectionTaskDetail : maintainanceTaskDetailDtos) {
             if(!"20200407".equals(inspectionTaskDetail.getState())){
                 continue;
@@ -102,7 +105,7 @@ public class ListMaintainanceTaskDetailCmd extends Cmd {
             photoVos = new ArrayList<>();
             for (FileRelDto tmpFileRelDto : fileRelDtos) {
                 photoVo = new PhotoVo();
-                photoVo.setUrl(tmpFileRelDto.getFileRealName());
+                photoVo.setUrl(tmpFileRelDto.getFileRealName().startsWith("http")?tmpFileRelDto.getFileRealName():imgUrl+tmpFileRelDto.getFileRealName());
                 photoVos.add(photoVo);
             }
             inspectionTaskDetail.setPhotos(photoVos);