人员补充报表

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/CoreMonitoringTaskRegistrationController.java

@@ -0,0 +1,84 @@
+package com.xunmei.core.access.controller;
+
+
+import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
+
+import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationMonitorService;
+import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.xunmei.common.log.annotation.Log;
+import com.xunmei.common.log.enums.BusinessType;
+import com.xunmei.common.security.annotation.RequiresPermissions;
+
+import com.xunmei.common.core.web.controller.BaseController;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.context.annotation.Lazy;
+
+/**
+ * 【请填写功能名称】Controller
+ *
+ * @author xunmei
+ * @date 2023-08-28
+ */
+@Api(tags = {"CoreMonitoringTaskRegistration"})
+@RestController
+@RequestMapping("/registration")
+public class CoreMonitoringTaskRegistrationController extends BaseController {
+    @Autowired
+    private ICoreMonitoringTaskRegistrationService iCoreMonitoringTaskRegistrationService;//扫描
+    @Autowired
+    private ICoreMonitoringTaskRegistrationMonitorService iCoreMonitoringTaskRegistrationMonitorService;//监控
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @ApiOperation(value = "查询CoreMonitoringTaskRegistration列表")
+    //  @RequiresPermissions("core:registration:list")
+    @GetMapping("/list")
+    public AjaxResult list(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
+        return success(iCoreMonitoringTaskRegistrationMonitorService.selectCoreMonitoringTaskRegistrationList(coreMonitoringTaskRegistration.getTaskId()));
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @ApiOperation(value = "获取CoreMonitoringTaskRegistration详细信息")
+    // @RequiresPermissions("core:registration:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(iCoreMonitoringTaskRegistrationService.selectCoreMonitoringTaskRegistrationById(id));
+    }
+
+    /**
+     * 新增【调阅任务登记NCF开始】
+     */
+    @ApiOperation(value = "新增CoreMonitoringTaskRegistration")
+    //   @RequiresPermissions("core:registration:add")
+    @Log(title = "【调阅任务登记NCF开始】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
+        return toAjax(iCoreMonitoringTaskRegistrationService.insertCoreMonitoringTaskRegistration(coreMonitoringTaskRegistration));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @ApiOperation(value = "修改CoreMonitoringTaskRegistration")
+//    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
+        return toAjax(iCoreMonitoringTaskRegistrationService.updateCoreMonitoringTaskRegistration(coreMonitoringTaskRegistration));
+    }
+
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -95,7 +95,6 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
 
     @Override
     public TableDataInfo selectPage(RetrievalTaskPageDto request) {
-
         Page<CoreMonitoringRetrievalTaskVo> page;
         //分页
         if (request.getPageNum() != null && request.getPageSize() != null) {

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -532,7 +532,11 @@ public class SysUserController extends BaseController {
             response.setCharacterEncoding("utf-8");
         }
     }
+    @RequiresPermissions("system:user:exportSecurity")
+    @PostMapping("/exportSecurity")
+    public void exportSecurity(SysUser user, HttpServletResponse response) {
 
+    }
     /**
      * 导出管理人员数据
      */

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysUserMapper.java

@@ -8,6 +8,7 @@ import com.xunmei.system.api.domain.SysRole;
 import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.domain.vo.SysUserVO;
 import com.xunmei.system.api.dto.SysPlanOrgDTO;
+import com.xunmei.system.util.SecurityUserExport;
 import com.xunmei.system.util.UserExport;
 import org.apache.ibatis.annotations.Param;
 
@@ -158,6 +159,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     List<SysUser> selectUserListByRoleAndOrg(@Param("sysRoleOrgDTO") SysPlanOrgDTO sysRoleOrgDTO);
 
     List<UserExport> select(@Param("info") SysUser user);
+   // List<SecurityUserExport>selectSecurityUser();
 
     List<String> selectCountByNames(@Param("names")List<String> names);
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysUserService.java

@@ -8,6 +8,7 @@ import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.domain.vo.SysUserListVo;
 import com.xunmei.system.domain.vo.SysUserVO;
 import com.xunmei.system.api.dto.SysPlanOrgDTO;
+import com.xunmei.system.util.SecurityUserExport;
 import com.xunmei.system.util.UserExport;
 
 import java.util.List;
@@ -234,7 +235,7 @@ public interface ISysUserService extends IService<SysUser> {
     List<SysUser> selectAllUser(String userName);
 
     List<UserExport> down(SysUser user);
-
+List<SecurityUserExport> downSecurityUser();
     List<String> selectCountByNames(List<String> names);
 
     List<SysUser>  selectUserListData(SysUser user);

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysUserServiceImpl.java

@@ -30,6 +30,7 @@ import com.xunmei.system.mapper.*;
 import com.xunmei.system.service.ISysConfigService;
 import com.xunmei.system.service.ISysOrgService;
 import com.xunmei.system.service.ISysUserService;
+import com.xunmei.system.util.SecurityUserExport;
 import com.xunmei.system.util.UserExport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -693,6 +694,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
+    public List<SecurityUserExport> downSecurityUser() {
+        SysOrg sysOrg = sysOrgMapper.selectById(SecurityUtils.getLoginUser().getOrgId());
+
+        return null;
+    }
+
+    @Override
     public List<String> selectCountByNames(List<String> names) {
         return userMapper.selectCountByNames(names);
     }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/SecurityUserExport.java

@@ -0,0 +1,63 @@
+package com.xunmei.system.util;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 安保人员导出
+ * @author :LuoWei
+ * @date : 2023/11/23
+ */
+@Data
+@ColumnWidth(15) //列宽,最大值为255
+@HeadRowHeight(16) //表头行高
+@ContentRowHeight(16) //数据行高
+public class SecurityUserExport {
+    @ExcelProperty(value = "序号", index = 0)
+    @TableField(exist = false)
+    private String xh;
+    @ExcelProperty(value = "地区", index = 1)
+    private String city;
+    @ExcelProperty(value = "单位名称", index = 2)
+    private String orgName;
+    @ExcelProperty(value = "姓名", index = 3)
+    private String name;
+    @ExcelProperty(value = "性别", index = 4, converter = GenderConverter.class)
+    private String gender;
+    @ExcelProperty(value = "身份证号码", index = 5)
+    private String card;
+    @ExcelProperty(value = "年龄", index = 6)
+    private Integer age;
+    @ExcelProperty(value = "部门名称", index = 7)
+    private String departmentName;
+    @ExcelProperty(value = "现任职务", index = 8)
+    private String nowDuties;
+    @ExcelProperty(value = "是否专职（专职是指专职做安全保卫部门相应岗位工作，不再兼任其他岗位或部门工作）", index = 9)
+    private String isFullTime;
+    @ExcelProperty(value = "用工形式", index = 9)
+    private String workType;
+    @ExcelProperty(value = "现任职时间", index = 10)
+    private Date entryTime;
+    @ExcelProperty(value = "工作年限", index = 11)
+    private String workDuration;
+    @ExcelProperty(value = "最高学历", index = 12)
+    private String highestEducation;
+    @ExcelProperty(value = "取得方式", index = 13)
+    private String educationType;
+    @ExcelProperty(value = "初级以上（含初级）相关专业技术职业资格", index = 14)
+    private String professionalQualifications;
+    @ExcelProperty(value = "持证上岗考试通过情况", index = 15)
+    private String certificateWork;
+    @ExcelProperty(value = "持证上岗考试通过情况", index = 16)
+    private String certificateFailReason;
+    @ExcelProperty(value = "分管领导姓名", index = 17)
+    private String responsibilitiesLeaderName;
+    @ExcelProperty(value = "分管领导职务", index = 18)
+    private String responsibilitiesLeaderDuties;
+}