Merge remote-tracking branch 'origin/master'

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquLubricationTaskManagementServiceImpl.java

@@ -66,7 +66,10 @@ public class EquLubricationTaskManagementServiceImpl extends ServiceImpl<EquLubr
                 if (ynDo!= null){
                     equLubricationTaskDetailVo.setIslubricationcompleted(ynDo.getName());
                 }
-                equLubricationTaskDetailVo.setCompletedateshow(TimeUtils.dateToString(equLubricationTaskDetailVo.getCompletedate(),"yyyy-MM-dd"));
+                if (equLubricationTaskDetailVo.getCompletedate()!= null){
+                    String formatDate = TimeUtils.dateToString(equLubricationTaskDetailVo.getCompletedate(),"yyyy-MM-dd");
+                    equLubricationTaskDetailVo.setCompletedateshow(formatDate);
+                }
                 dataList.add(JSONObject.parseObject(JSONObject.toJSONString(equLubricationTaskDetailVo), Map.class));
             }
             dataMap.put("list",dataList);

cx-equipment/cx-equipment-common/src/main/resources/mybatis/business/EquLubricationTaskDetailDao.xml

@@ -8,7 +8,8 @@
             b.EQUIPMENT,
             b.EQUIPMENTWORKSHOP,
             b.EQUIPMENTNUMBER,
-            b.BELONGFACTORY
+            b.BELONGFACTORY,
+            b.COMPLETEDATE
         FROM equ_lubrication_task_detail a
         LEFT JOIN equ_lubrication_task_management b ON a.MASTERID = b.id and b.DELETED = 0
         where a.DELETED = 0

cx-equipment/cx-equipment-entity/src/main/java/com/rongwei/bsentity/domain/EquLubricationTaskDetailDo.java

@@ -106,9 +106,9 @@ public class EquLubricationTaskDetailDo extends BaseDo implements Serializable {
     private String islubricationcompleted;
 
     /**
-     * 所属工厂
+     * 是否润滑完成
      */
-    @TableField("BELONGFACTORY")
-    private String belongfactory;
+    @TableField("DESCRIPTION")
+    private String description;
 
 }

cx-equipment/cx-equipment-entity/src/main/java/com/rongwei/bsentity/domain/EquLubricationTaskDetailVo.java

@@ -41,4 +41,10 @@ public class EquLubricationTaskDetailVo extends EquLubricationTaskDetailDo imple
      */
     private String completedateshow;
 
+    /**
+     * 所属工厂
+     */
+    @TableField("BELONGFACTORY")
+    private String belongfactory;
+
 }