Parcourir la source

查获记录-开机指令

chenshudong il y a 1 semaine
Parent
commit
4a28ca0199

+ 2 - 0
airport-admin/src/main/java/com/sundot/airport/web/controller/item/ItemSeizureRecordController.java

@@ -156,6 +156,7 @@ public class ItemSeizureRecordController extends BaseController {
156 156
                     exportVO.setCheckMethodDesc(record.getCheckMethodDesc());
157 157
                     exportVO.setInspectTeamName(record.getInspectTeamName());
158 158
                     exportVO.setAttendanceTeamName(record.getAttendanceTeamName());
159
+                    exportVO.setPowerOnInstruction(record.getPowerOnInstruction());
159 160
                     exportVO.setProcessStatus(record.getProcessStatus());
160 161
 
161 162
                     // 物品信息为空
@@ -187,6 +188,7 @@ public class ItemSeizureRecordController extends BaseController {
187 188
                         exportVO.setCheckMethodDesc(record.getCheckMethodDesc());
188 189
                         exportVO.setInspectTeamName(record.getInspectTeamName());
189 190
                         exportVO.setAttendanceTeamName(record.getAttendanceTeamName());
191
+                        exportVO.setPowerOnInstruction(record.getPowerOnInstruction());
190 192
                         exportVO.setProcessStatus(record.getProcessStatus());
191 193
 
192 194
                         // 物品信息

+ 6 - 0
airport-item/src/main/java/com/sundot/airport/item/domain/vo/ItemSeizureRecordExportVO.java

@@ -79,6 +79,12 @@ public class ItemSeizureRecordExportVO {
79 79
     private String isActiveConcealmentDesc;
80 80
 
81 81
     /**
82
+     * 开机指令:0=指令,1=非指令
83
+     */
84
+    @Excel(name = "开机指令", readConverterExp = "0=指令,1=非指令", combo = "指令,非指令", sort = 12)
85
+    private Integer powerOnInstruction;
86
+
87
+    /**
82 88
      * 流程状态:0=草稿,1=审核中,2=人工终止,3=归档
83 89
      */
84 90
     @Excel(name = "流程状态", readConverterExp = "0=草稿,1=审核中,2=人工终止,3=归档", combo = "草稿,审核中,人工终止,归档")

+ 1 - 0
airport-item/src/main/resources/mapper/item/ItemSeizureRecordMapper.xml

@@ -203,6 +203,7 @@
203 203
                 and seizure_time >= #{beginTime}
204 204
                 and seizure_time <![CDATA[ < ]]> date_add(#{endTime} , interval 1 day)
205 205
             </if>
206
+            <if test="powerOnInstruction != null ">and power_on_instruction = #{powerOnInstruction}</if>
206 207
         </where>
207 208
         order by create_time desc
208 209
     </select>