更新代码

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/param/InputItemPageParam.java

@@ -18,6 +18,16 @@ public class InputItemPageParam extends CommonPageable{
 
 	private String inputClassify;
 
+	public String getItemClassify() {
+		return itemClassify;
+	}
+
+	public void setItemClassify(String itemClassify) {
+		this.itemClassify = itemClassify;
+	}
+
+	private String itemClassify;
+
 	public String getInputClassify() {
 		return inputClassify;
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/util/InputItemParamUtil.java

@@ -55,6 +55,8 @@ public class InputItemParamUtil {
                     param.setItemNo(toString(queryRequests.get(i).getValue()));
                 } else if ("inputClassify".equals(name)) {
                     param.setInputClassify(toString(queryRequests.get(i).getValue()));
+                } else if ("itemClassify".equals(name)) {
+                    param.setItemClassify(toString(queryRequests.get(i).getValue()));
                 }
             }
         }

amos-boot-system-supervision/src/main/resources/db/changelog/mt-1.0.0.xml

@@ -73,7 +73,7 @@
         </preConditions>
         <comment>p_input_item ADD COLUMN item_level</comment>
         <sql>
-            ALTER TABLE p_input_item ADD COLUMN `item_level` varchar(50) DEFAULT NULL COMMENT '检查项等级' AFTER `item_type_classify`;
+            ALTER TABLE p_input_item ADD COLUMN `item_level` varchar(50) DEFAULT NULL COMMENT '检查项等级' AFTER `item_type_classify`;修改列
         </sql>
     </changeSet>
 
@@ -88,4 +88,74 @@
             ALTER TABLE p_input_item ADD COLUMN `item_start` bit(1) DEFAULT b'0' COMMENT '检查项状态' AFTER `item_level`;
         </sql>
     </changeSet>
+
+    <changeSet author="keyong" id="1629688658-1">
+        <preConditions onFail="MARK_RAN">
+            <columnExists tableName="p_plan_task_detail" columnName="executor_id"/>
+        </preConditions>
+        <comment>p_plan_task_detail modify column executor_id</comment>
+        <sql>
+            alter table `p_plan_task_detail` modify column `executor_id` text COMMENT '执行人id' after `status`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629688658-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_plan_task_detail" columnName="executor_name"/>
+            </not>
+        </preConditions>
+        <comment>p_plan_task_detail ADD COLUMN executor_name</comment>
+        <sql>
+            ALTER TABLE `p_plan_task_detail` ADD COLUMN `executor_name` text DEFAULT null COMMENT '执行人名称' AFTER `executor_id`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629688658-3">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_plan_task_detail" columnName="item_num"/>
+            </not>
+        </preConditions>
+        <comment>p_plan_task_detail ADD COLUMN item_num</comment>
+        <sql>
+            ALTER TABLE `p_plan_task_detail` ADD COLUMN `item_num` int(11) DEFAULT 0 COMMENT '检查项个数' AFTER `executor_name`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629688658-4">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_plan_task_detail" columnName="executed_num"/>
+            </not>
+        </preConditions>
+        <comment>p_plan_task_detail ADD COLUMN executed_num</comment>
+        <sql>
+            ALTER TABLE `p_plan_task_detail` ADD COLUMN `executed_num` int(11) DEFAULT 0 COMMENT '已执行个数' AFTER `item_num`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629688658-5">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_plan_task_detail" columnName="safety_danger_num"/>
+            </not>
+        </preConditions>
+        <comment>p_plan_task_detail ADD COLUMN safety_danger_num</comment>
+        <sql>
+            ALTER TABLE `p_plan_task_detail` ADD COLUMN `safety_danger_num` int(11) DEFAULT 0 COMMENT '安全隐患个数' AFTER `executed_num`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629688658-6">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_plan_task_detail" columnName="major_danger_num"/>
+            </not>
+        </preConditions>
+        <comment>p_plan_task_detail ADD COLUMN major_danger_num</comment>
+        <sql>
+            ALTER TABLE `p_plan_task_detail` ADD COLUMN `major_danger_num` int(11) DEFAULT 0 COMMENT '重大隐患个数' AFTER `safety_danger_num`;
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_input_item.xml

@@ -115,7 +115,7 @@
 		<if test="itemNo!=null"> and a.item_no like concat(concat("%",#{itemNo}),"%")</if>
 		<if test="itemType!=null"> and a.item_Type = #{itemType} </if>
 		<if test="orgCode!=null"> and a.org_Code = #{orgCode}</if>
-		<if test="inputClassify != null"> and a.input_classify = #{inputClassify}</if>
+		<if test="itemClassify != null"> and a.item_classify = #{itemClassify}</if>
 		order by a.id desc
 		<choose>
 	     <when test="pageSize==-1"></when>