fix:查询人员记录提交

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysPropertynumController.java

@@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.TdPropertyEment;
 import com.ruoyi.system.domain.TdPropertyInfo;
 import com.ruoyi.system.domain.TdPropertyManager;
 import com.ruoyi.system.domain.count.PropertyDesCountDTO;
@@ -16,12 +17,14 @@ import com.ruoyi.system.domain.count.UserSmCountDTO;
 import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ITdPropertyInfoService;
 import com.ruoyi.system.service.ITdPropertyManagerService;
+import com.ruoyi.system.service.TdPropertyEmentService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -37,10 +40,12 @@ public class SysPropertynumController extends BaseController {
     @Autowired
     private ITdPropertyInfoService tdPropertyInfoService;
 
+    @Resource
+    private TdPropertyEmentService tdPropertyEmentService;
+
     @RequiresPermissions("system:propertynum:view")
     @GetMapping()
-    public String property()
+    public String property() {
-    {
         return prefix + "/propertynum";
     }
 
@@ -50,8 +55,7 @@ public class SysPropertynumController extends BaseController {
     @RequiresPermissions("system:propertynum:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(TdPropertyManager tdPropertyManager)
+    public TableDataInfo list(TdPropertyManager tdPropertyManager) {
-    {
         startPage();
         List<TdPropertyManager> list = tdPropertyManagerService.selectTdPropertyManagerList(tdPropertyManager);
         return getDataTable(list);
@@ -62,9 +66,8 @@ public class SysPropertynumController extends BaseController {
      */
     @RequiresPermissions("system:propertynum:print")
     @GetMapping("/print/{useId}")
-    @Log(title = "密品设备统计", businessType = BusinessType.PRINT)
+    @Log(title = "涉密信息设备统计", businessType = BusinessType.PRINT)
-    public String print(@PathVariable("useId") String useId, ModelMap mmap)
+    public String print(@PathVariable("useId") String useId, ModelMap mmap) {
-    {
         List<TdPropertyInfo> tdPropertyInfos = tdPropertyInfoService.selectTdPropertyInfoByUseId(useId);
         TdPropertyManager tdPropertyManager = tdPropertyManagerService.selectTdPropertyManagerByUseId(useId);
         mmap.put("tdPropertyInfos", tdPropertyInfos);
@@ -73,12 +76,29 @@ public class SysPropertynumController extends BaseController {
         return prefix + "/print";
     }
 
+    /**
+     * 打印界面
+     */
+    @RequiresPermissions("system:propertynum:print")
+    @GetMapping("/printEment/{useId}")
+    @Log(title = "涉密设备统计", businessType = BusinessType.PRINT)
+    public String printEment(@PathVariable("useId") String useId, ModelMap mmap) {
+        TdPropertyManager tdPropertyManager = tdPropertyManagerService.selectTdPropertyManagerByUseId(useId);
+        List<TdPropertyEment> tdPropertyEments = tdPropertyEmentService.lambdaQuery()
+                .eq(TdPropertyEment::getUseId, useId).list();
+        mmap.put("tdPropertyEments", tdPropertyEments);
+        mmap.put("tdPropertyManager", tdPropertyManager);
+        mmap.put("sysuser", getSysUser());
+        return prefix + "/printEment";
+    }
+
+
     @Autowired
     private ISysDictDataService dictDataService;
 
     /**
-     * 
      * 密品统计
+     *
      * @return com.ruoyi.common.core.domain.AjaxResult
      */
 
@@ -110,8 +130,8 @@ public class SysPropertynumController extends BaseController {
     private List<String> xh = Arrays.asList("未销毁", "已销毁");
 
     /**
-     *
      * 统计密品报废统计
+     *
      * @return com.ruoyi.common.core.domain.AjaxResult
      */
     @PostMapping("/countBF")
@@ -134,9 +154,10 @@ public class SysPropertynumController extends BaseController {
                 .collect(Collectors.toList());
         return AjaxResult.success(datas);
     }
+
     /**
-     *
      * 统计密品销毁统计
+     *
      * @return com.ruoyi.common.core.domain.AjaxResult
      */
     @PostMapping("/countXH")