fix:密品设备维修提交

ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CheckReportManager.java

@@ -58,7 +58,7 @@ public class CheckReportManager {
                     .remove();
         } else {
             if(Objects.isNull(tdCheckReport.getCheckState())){
-                tdCheckReport.setCheckState("2");
+                tdCheckReport.setCheckState("3");
             }
             tdCheckReport.setDepart(ShiroUtils.getSysUser().getDept().getDeptName());
             tdCheckReport.setAdduser(ShiroUtils.getSysUser().getUserName());

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/CheckReportController.java

@@ -173,6 +173,7 @@ public class CheckReportController extends BaseController {
     @PostMapping("/selfCheckSave")
     @ResponseBody
     public AjaxResult selfCheckSave(@RequestBody TdCheckReportDTO checkReportDTO) {
+        checkReportDTO.setCheckState("2");
         return toAjax(checkReportManager.saveOrUpdate(checkReportDTO));
     }
 

ruoyi-admin/src/main/resources/templates/system/checkReport/checkReport.html

@@ -142,7 +142,7 @@
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="openEdit(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + selfCheckFlag + '" href="javascript:void(0)" onclick="selfcheck(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>自查</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + selfCheckFlag + '" href="javascript:void(0)" onclick="selfcheck(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>初检</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.checkId + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }

ruoyi-admin/src/main/resources/templates/system/checkresult/checkresult.html

@@ -138,7 +138,7 @@
                     formatter: function(value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + downloadFlag + '" href="javascript:void(0)" onclick="checkResultPrint(\'' + row.checkId + '\')"><i class="fa fa-download"></i>打印</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + checkresultFlag + '" href="javascript:void(0)" onclick="resultCheck(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>检查</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + checkresultFlag + '" href="javascript:void(0)" onclick="resultCheck(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>保密检查</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.checkId + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }

ruoyi-system/src/main/resources/mapper/system/TdCheckReportMapper.xml

@@ -39,7 +39,7 @@
             <if test="depart!=null and depart!=''">
                 AND depart = #{depart}
             </if>
-            AND  (check_type = '0' or check_type is null)
+            AND  check_state = '3'
         </trim>
         ORDER BY create_time DESC
     </select>
@@ -59,7 +59,7 @@
             <if test="depart!=null and depart!=''">
                 AND depart = #{depart}
             </if>
-            AND check_type in (0,1)
+            AND  check_state != '3'
         </trim>
         ORDER BY create_time DESC
     </select>