更改日期相关字段的类型，查询按照createtiime进行排序

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/entity/CmmsInspectContent.java

@@ -56,16 +56,16 @@ public class CmmsInspectContent implements Serializable {
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
 	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建日期")
     private java.util.Date createTime;
 	/**更新人*/
     @ApiModelProperty(value = "更新人")
     private java.lang.String updateBy;
 	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
 	/**所属部门*/

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/mapper/xml/CmmsInspectContentMapper.xml

@@ -33,6 +33,7 @@
             <if test="cmmsInspectContent.contentname != null  and cmmsInspectContent.contentname != ''"> and (c.contentcode like concat('%', #{cmmsInspectContent.contentname}, '%') or c.contentname like concat('%', #{cmmsInspectContent.contentname}, '%'))</if>
             <if test="cmmsInspectContent.equipmentid != null "> and c.equipmentid = #{cmmsInspectContent.equipmentid}</if>
         </where>
+        order by c.create_time
     </select>
 
 
@@ -58,5 +59,6 @@
         from cmms_inspect_content a
         left join tpm_equipment as e on a.equipmentid = e.id
         where a.equipmentid = #{eqid}
+        order by a.create_time
     </select>
 </mapper>

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContentItem/entity/CmmsInspectContentItem.java

@@ -48,16 +48,16 @@ public class CmmsInspectContentItem implements Serializable {
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
 	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建日期")
     private java.util.Date createTime;
 	/**更新人*/
     @ApiModelProperty(value = "更新人")
     private java.lang.String updateBy;
 	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
 	/**所属部门*/

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectItem/entity/CmmsInspectItem.java

@@ -40,16 +40,16 @@ public class CmmsInspectItem implements Serializable {
     @ApiModelProperty(value = "创建者")
     private java.lang.String createBy;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private java.util.Date createTime;
 	/**更新者*/
     @ApiModelProperty(value = "更新者")
     private java.lang.String updateBy;
 	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private java.util.Date updateTime;
 	/**备注*/

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectItem/mapper/xml/CmmsInspectItemMapper.xml

@@ -36,7 +36,9 @@
         <where>
             <if test="cmmsInspectItem.itemcode != null  and cmmsInspectItem.itemcode != ''"> and (c.itemcode like concat('%', #{cmmsInspectItem.itemcode}, '%') or c.itemname like concat('%', #{cmmsInspectItem.itemcode}, '%'))</if>
             <if test="cmmsInspectItem.equipdefid != null "> and c.equipdefid = #{cmmsInspectItem.equipdefid}</if>
+            <if test="cmmsInspectItem.classification != null "> and c.classification = #{cmmsInspectItem.classification}</if>
         </where>
+        order by c.create_time
     </select>
 
 

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/entity/CmmsInspectLine.java

@@ -40,16 +40,16 @@ public class CmmsInspectLine implements Serializable {
     @ApiModelProperty(value = "创建者")
     private java.lang.String createBy;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private java.util.Date createTime;
 	/**更新者*/
     @ApiModelProperty(value = "更新者")
     private java.lang.String updateBy;
 	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private java.util.Date updateTime;
 	/**备注*/

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/entity/CmmsInspectSpot.java

@@ -40,16 +40,16 @@ public class CmmsInspectSpot implements Serializable {
     @ApiModelProperty(value = "创建者")
     private java.lang.String createBy;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private java.util.Date createTime;
 	/**更新者*/
     @ApiModelProperty(value = "更新者")
     private java.lang.String updateBy;
 	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private java.util.Date updateTime;
 	/**备注*/

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/entity/CmmsInspectTcontentItem.java

@@ -48,6 +48,10 @@ public class CmmsInspectTcontentItem implements Serializable {
 	@Excel(name = "巡检项ID", width = 15)
     @ApiModelProperty(value = "巡检项ID")
     private java.lang.String inspectitemid;
+	/**巡检工单ID*/
+	@Excel(name = "巡检工单ID", width = 15)
+    @ApiModelProperty(value = "巡检工单ID")
+	private java.lang.String inspectid;
 	/**备注*/
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
@@ -76,6 +80,18 @@ public class CmmsInspectTcontentItem implements Serializable {
 	@Excel(name = "参考值", width = 15)
     @ApiModelProperty(value = "参考值")
     private java.lang.String refervalue;
+
+    /** 巡检标准 */
+    @Excel(name = "巡检标准", width = 15)
+    @ApiModelProperty(value = "巡检标准")
+    private java.lang.String inspectionstandards;
+
+    /** 分类 */
+    @Excel(name = "分类", width = 15)
+    @ApiModelProperty(value = "分类")
+    @Dict(dicCode = "inspect_item_type")
+    private java.lang.String classification;
+
 	/**标签(多个用逗号隔开)*/
 	@Excel(name = "标签(多个用逗号隔开)", width = 15)
     @ApiModelProperty(value = "标签(多个用逗号隔开)")

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTline/entity/CmmsInspectTline.java

@@ -35,19 +35,19 @@ public class CmmsInspectTline implements Serializable {
 	/**巡检线路ID*/
 	@Excel(name = "巡检线路ID", width = 15)
     @ApiModelProperty(value = "巡检线路ID")
-    private java.lang.Integer tinspectlineid;
+    private java.lang.String id;
 	/**原巡检线路ID*/
 	@Excel(name = "原巡检线路ID", width = 15)
     @ApiModelProperty(value = "原巡检线路ID")
-    private java.lang.Integer inspectlineid;
+    private java.lang.String inspectlineid;
 	/**巡检工单ID*/
 	@Excel(name = "巡检工单ID", width = 15)
     @ApiModelProperty(value = "巡检工单ID")
-    private java.lang.Integer inspectid;
+    private java.lang.String inspectid;
 	/**是否必须执行：0否，1是*/
 	@Excel(name = "是否必须执行：0否，1是", width = 15)
     @ApiModelProperty(value = "是否必须执行：0否，1是")
-    private java.lang.Integer ifmustexec;
+    private java.lang.String ifmustexec;
 	/**巡检路线编号*/
 	@Excel(name = "巡检路线编号", width = 15)
     @ApiModelProperty(value = "巡检路线编号")
@@ -60,4 +60,7 @@ public class CmmsInspectTline implements Serializable {
 	@Excel(name = "细则数量", width = 15)
     @ApiModelProperty(value = "细则数量")
     private java.lang.Integer detailnum;
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsOrderNode/entity/CmmsOrderNode.java

@@ -40,16 +40,16 @@ public class CmmsOrderNode implements Serializable {
     @ApiModelProperty(value = "创建者")
     private java.lang.String createBy;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private java.util.Date createTime;
 	/**更新者*/
     @ApiModelProperty(value = "更新者")
     private java.lang.String updateBy;
 	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private java.util.Date updateTime;
 	/**备注*/
@@ -69,9 +69,9 @@ public class CmmsOrderNode implements Serializable {
     @ApiModelProperty(value = "处理意见")
     private java.lang.String opinion;
 	/**处理时间*/
-	@Excel(name = "处理时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@Excel(name = "处理时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "处理时间")
     private java.util.Date handledate;
     /**所属部门*/

module_cmms/src/main/java/org/jeecg/modules/cmmsRepair/entity/CmmsRepair.java

@@ -44,16 +44,16 @@ public class CmmsRepair implements Serializable {
     @ApiModelProperty(value = "创建者")
     private java.lang.String createBy;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private java.util.Date createTime;
 	/**更新者*/
     @ApiModelProperty(value = "更新者")
     private java.lang.String updateBy;
 	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private java.util.Date updateTime;
 	/**备注*/
@@ -86,9 +86,9 @@ public class CmmsRepair implements Serializable {
     @Dict(dicCode = "repair_priority")
     private java.lang.String priority;
 	/**故障日期*/
-	@Excel(name = "故障日期", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@Excel(name = "故障日期", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "故障日期")
     private java.util.Date faultdate;
 	/**故障描述*/
@@ -100,9 +100,9 @@ public class CmmsRepair implements Serializable {
     @ApiModelProperty(value = "待办人")
     private java.lang.String repairuser;
 	/**维修时间*/
-	@Excel(name = "维修时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@Excel(name = "维修时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "维修时间")
     private java.util.Date repairdate;
 	/**维修反馈*/