Merge remote-tracking branch 'origin/V0.0.4' into V0.0.4

project_data/sql/0.0.3/soc/soc.sql

@@ -1449,6 +1449,26 @@ IF NOT EXISTS(SELECT *
         ADD COLUMN `join_names` varchar(255) NULL COMMENT '参与人员';
 
 END IF;
+-- 安全责任书
+IF NOT EXISTS(SELECT *
+              FROM information_schema.columns
+              WHERE table_schema = DATABASE()
+                AND table_name = 'core_safety_book_aqbwbndjh'
+                AND column_name = 'type') THEN
+    ALTER TABLE `core_safety_book_aqbwbndjh`
+        ADD COLUMN `type` varchar(255) NULL COMMENT '文件种类';
+
+END IF;
+-- 安全责任书
+IF NOT EXISTS(SELECT *
+              FROM information_schema.columns
+              WHERE table_schema = DATABASE()
+                AND table_name = 'core_safety_book_aqbwbndjh'
+                AND column_name = 'year') THEN
+    ALTER TABLE `core_safety_book_aqbwbndjh`
+        ADD COLUMN `year` int NULL COMMENT '工作年度';
+
+END IF;
 
 END ??
 DELIMITER;

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/letter/vo/CoreIntroduceLetterVo.java

@@ -107,4 +107,11 @@ public class CoreIntroduceLetterVo {
 
     @ApiModelProperty(value = "是否已经有出入记录")
     private boolean haveOutInRecord;
+
+    private Integer approveStatus;
+    private String approveRemark;
+    private Date approveTime;
+
+
+
 }

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

@@ -0,0 +1,83 @@
+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")
+    @PutMapping
+    public AjaxResult edit(@RequestBody CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
+        return toAjax(iCoreMonitoringTaskRegistrationService.updateCoreMonitoringTaskRegistration(coreMonitoringTaskRegistration));
+    }
+
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/CoreMonitoringTaskRegistrationServiceImpl.java

@@ -0,0 +1,164 @@
+package com.xunmei.core.access.service.impl;
+
+
+import com.alibaba.nacos.common.utils.CollectionUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
+import com.xunmei.common.core.exception.ServiceException;
+import com.xunmei.common.core.utils.DateUtils;
+import com.xunmei.common.core.utils.StringUtils;
+import com.xunmei.common.core.utils.bean.BeanUtils;
+import com.xunmei.common.security.utils.SecurityUtils;
+import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
+import com.xunmei.core.access.mapper.CoreMonitoringTaskMonitorInfoMapper;
+import com.xunmei.core.access.mapper.CoreMonitoringTaskRegistrationMapper;
+import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationService;
+import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;
+import com.xunmei.core.retrieval.mapper.CoreMonitoringRetrievalTaskMapper;
+import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Service业务层处理
+ *
+ * @author xunmei
+ * @date 2023-08-28
+ */
+@Service
+public class CoreMonitoringTaskRegistrationServiceImpl extends ServiceImpl<CoreMonitoringTaskRegistrationMapper, CoreMonitoringTaskRegistration> implements ICoreMonitoringTaskRegistrationService {
+    private static final String ONE = "1";
+    private static final String TWO = "2";
+    @Autowired
+    private CoreMonitoringTaskRegistrationMapper coreMonitoringTaskRegistrationMapper;
+    @Autowired
+    private ICoreMonitoringRetrievalTaskService iCoreMonitoringRetrievalTaskService;//任务
+    @Autowired
+    private CoreMonitoringRetrievalTaskMapper coreMonitoringRetrievalTaskMapper;//任务
+    @Autowired
+    private CoreMonitoringTaskMonitorInfoMapper coreMonitoringTaskMonitorInfoMapper;//项目
+
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public CoreMonitoringTaskRegistrationVO selectCoreMonitoringTaskRegistrationById(Long id) {
+        CoreMonitoringTaskRegistrationVO coreMonitoringTaskRegistrationVO = new CoreMonitoringTaskRegistrationVO();
+        CoreMonitoringTaskRegistration coreMonitoringTaskRegistration = coreMonitoringTaskRegistrationMapper.selectById(id);
+        BeanUtils.copyProperties(coreMonitoringTaskRegistration, coreMonitoringTaskRegistrationVO);
+        CoreMonitoringRetrievalTask coreMonitoringRetrievalTask = iCoreMonitoringRetrievalTaskService.selectCoreMonitoringRetrievalTaskById(coreMonitoringTaskRegistration.getTaskId());
+        coreMonitoringTaskRegistrationVO.setTaskName(coreMonitoringRetrievalTask.getTaskName());
+        return coreMonitoringTaskRegistrationVO;
+    }
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param coreMonitoringTaskRegistration 【请填写功能名称】
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public List<CoreMonitoringTaskRegistration> selectCoreMonitoringTaskRegistrationList(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
+        return coreMonitoringTaskRegistrationMapper.selectList(new QueryWrapper<>(coreMonitoringTaskRegistration));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param coreMonitoringTaskRegistration 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int insertCoreMonitoringTaskRegistration(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
+        //jiaoyan
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("task_id", coreMonitoringTaskRegistration.getTaskId());
+        queryWrapper.eq("del_flag", 0);
+        List<CoreMonitoringTaskRegistration> list = baseMapper.selectList(queryWrapper);
+        if (CollectionUtils.isNotEmpty(list)) {
+            if (StringUtils.isEmpty(coreMonitoringTaskRegistration.getEndNfc()) && StringUtils.isEmpty(coreMonitoringTaskRegistration.getEndPicture())) {
+                throw new ServiceException("请勿重复扫描");
+            }
+            CoreMonitoringTaskRegistration coreMonitoringTaskRegistration1 = list.get(0);
+            coreMonitoringTaskRegistration1.setEndPicture(coreMonitoringTaskRegistration.getEndPicture());
+            coreMonitoringTaskRegistration1.setEndNfc(coreMonitoringTaskRegistration.getEndNfc());
+            Long time = DateUtils.getNowDate().getTime() - coreMonitoringTaskRegistration1.getTaskStartTime().getTime();
+            Double avg = (double) time / 1000 / 3600;
+            coreMonitoringTaskRegistration1.setAverageDuration(Double.valueOf(String.format("%.2f", avg)));
+            return baseMapper.updateById(coreMonitoringTaskRegistration1);
+        } else {
+            coreMonitoringTaskRegistration.setCreateTime(DateUtils.getNowDate());
+            coreMonitoringTaskRegistration.setTaskStartTime(DateUtils.getNowDate());
+            coreMonitoringTaskRegistration.setDelFlag("0");
+            coreMonitoringTaskRegistration.setCreateBy(SecurityUtils.getUsername());
+            //修改任务状态为进行中
+            CoreMonitoringRetrievalTask coreMonitoringRetrievalTask = coreMonitoringRetrievalTaskMapper.selectCoreMonitoringRetrievalTaskById(coreMonitoringTaskRegistration.getTaskId());
+            coreMonitoringRetrievalTask.setStatus(ONE);
+            coreMonitoringRetrievalTask.setStartTime(DateUtils.getNowDate());
+            coreMonitoringRetrievalTaskMapper.updateById(coreMonitoringRetrievalTask);
+            coreMonitoringTaskRegistration.setId(IdWorker.getId());
+            return coreMonitoringTaskRegistrationMapper.insert(coreMonitoringTaskRegistration);
+        }
+
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param coreMonitoringTaskRegistration 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int updateCoreMonitoringTaskRegistration(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
+        coreMonitoringTaskRegistration.setUpdateTime(DateUtils.getNowDate());
+        coreMonitoringTaskRegistration.setUpdateBy(SecurityUtils.getUsername());
+        //修改任务状态已完成
+        CoreMonitoringRetrievalTask coreMonitoringRetrievalTask = coreMonitoringRetrievalTaskMapper.selectCoreMonitoringRetrievalTaskById(coreMonitoringTaskRegistration.getTaskId());
+        coreMonitoringRetrievalTask.setStatus(TWO);
+        coreMonitoringRetrievalTask.setEndTime(DateUtils.getNowDate());
+        coreMonitoringRetrievalTask.setUpdateBy(SecurityUtils.getUsername());
+        coreMonitoringRetrievalTask.setUpdateTime(DateUtils.getNowDate());
+        coreMonitoringRetrievalTask.setSubmitTime(DateUtils.getNowDate());
+        coreMonitoringRetrievalTask.setRetrievalUser(SecurityUtils.getUserId());
+        int i = coreMonitoringTaskMonitorInfoMapper.selectAbnormalByTaskId(coreMonitoringTaskRegistration.getTaskId());
+        coreMonitoringRetrievalTask.setExceptionCount(i);
+        coreMonitoringRetrievalTaskMapper.updateCoreMonitoringRetrievalTask(coreMonitoringRetrievalTask);
+        return coreMonitoringTaskRegistrationMapper.updateById(coreMonitoringTaskRegistration);
+    }
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param ids 需要删除的【请填写功能名称】主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCoreMonitoringTaskRegistrationByIds(Long[] ids) {
+        return coreMonitoringTaskRegistrationMapper.deleteBatchIds(Arrays.asList((ids)));
+    }
+
+    /**
+     * 删除【请填写功能名称】信息
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCoreMonitoringTaskRegistrationById(Long id) {
+        return coreMonitoringTaskRegistrationMapper.deleteById(id);
+    }
+
+    @Override
+    public void deleteByTaskId(Long taskId) {
+        coreMonitoringTaskRegistrationMapper.deleteByTaskId(taskId);
+    }
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/vo/app/AppOverviewVo.java

@@ -11,21 +11,21 @@ import java.util.Map;
 @Data
 public class AppOverviewVo {
     @ApiModelProperty("行社数量")
-    private Integer hangsheCount;
+    private int hangsheCount;
     @ApiModelProperty("营业网点数量")
-    private Integer bankingCount;
+    private int bankingCount;
     @ApiModelProperty("中心业务库数量")
-    private Integer centerStoreCount;
+    private int centerStoreCount;
     @ApiModelProperty("网点业务库数量")
-    private Integer bankingStoreCount;
+    private int bankingStoreCount;
     @ApiModelProperty("在行式自动银行数量")
-    private  Integer onlineATMCount;
+    private  int onlineATMCount;
     @ApiModelProperty("离行式自动银行数量")
-    private Integer offlineATMCount;
+    private int offlineATMCount;
     @ApiModelProperty("大堂式设备数量")
-    private Integer lobbyDeviceCount;
+    private int lobbyDeviceCount;
     @ApiModelProperty("穿墙式设备数量")
-    private Integer throughwallDeviceCount;
+    private int throughwallDeviceCount;
 
     @ApiModelProperty("GA38信息：GA382021、GA382015")
     private Map<String,AppOverviewItemVo>  ga38;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/mapper/CoreIntroduceLetterMapper.java

@@ -79,6 +79,8 @@ public interface CoreIntroduceLetterMapper extends BaseMapper<CoreIntroduceLette
     void deleteToOrgList(@Param("letterId") Long letterId);
 
     Page<CoreIntroduceLetterVo> selectPageList(@Param("page") Page<CoreIntroduceLetterVo> page, @Param("coreIntroduceLetter") CoreIntroduceLetterRequestDto coreIntroduceLetter);
+    Page<CoreIntroduceLetterVo> selectPageListForApp(@Param("page") Page<CoreIntroduceLetterVo> page, @Param("coreIntroduceLetter") CoreIntroduceLetterRequestDto coreIntroduceLetter);
+
 
     List<CoreIntroduceLetterToOrg> findToOrgListA(@Param("records")  List<CoreIntroduceLetterVo> records);
     List<CoreIntroduceLetterToOrg> findToOrgListB(@Param("records")  List<CoreIntroduceLetterInfoVo> records);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreIntroduceLetterServiceImpl.java

@@ -66,8 +66,16 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
 //        if (ObjectUtil.isNotNull(request.getRequestFromWeb()) && request.getRequestFromWeb() ) {
 //            request.setType(1);
 //        }
-        //获取数据
-        page = coreIntroduceLetterMapper.selectPageList(page, request);
+        if(ObjectUtil.equal(request.getRequestFromWeb(),true)){
+            //获取数据
+            page = coreIntroduceLetterMapper.selectPageList(page, request);
+        }
+        else
+        {
+            page = coreIntroduceLetterMapper.selectPageListForApp(page, request);
+        }
+
+
         if(CollectionUtils.isNotEmpty(page.getRecords())){
             List<SysOrg> orgList = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.findAllOrg(SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
             page = this.buildPageVo(page, orgList);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/monitor/service/impl/MonitorAccessReportServiceImpl.java

@@ -117,7 +117,7 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
                     sysOrg1 = remoteOrgService.selectOrgById(remoteOrgService.selectOrgById(remoteOrgService.selectOrgById(s.getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER);
                 }
             }
-            monitoringAccessVO.setCity(sysOrg1.getShortName().split("地区行社")[0]);
+            monitoringAccessVO.setCity(sysOrg1.getShortName().indexOf("地区行社")==-1?sysOrg1.getShortName().substring(0,2):sysOrg1.getShortName().split("地区行社")[0]);
             Integer integer = monitorAccessReportMapper.selectNetworkNumberByPath(s.getPath());
             monitoringAccessDTO.setOrgPath(s.getPath());
             MonitoringAccessVO monitoringAccessVO1 = monitorAccessReportMapper.selectAll(monitoringAccessDTO);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/resumption/service/impl/ResumptionReportServiceImpl.java

@@ -61,7 +61,7 @@ public class ResumptionReportServiceImpl implements ResumptionReportService {
                     sysOrg1 = orgService.selectOrgById(orgService.selectOrgById(orgService.selectOrgById(o.getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER);
                 }
             }
-            resumptionDayVO.setCity(sysOrg1.getShortName().split("地区行社")[0]);
+            resumptionDayVO.setCity(sysOrg1.getShortName().indexOf("地区行社")==-1?sysOrg1.getShortName().substring(0,2):sysOrg1.getShortName().split("地区行社")[0]);
             resumptionDayVO.setOrgName(o.getShortName());
             Integer integer = monitorAccessReportMapper.selectNetworkNumberByPath(o.getPath());
             resumptionDayVO.setNetworkNumber(integer);
@@ -132,10 +132,13 @@ public class ResumptionReportServiceImpl implements ResumptionReportService {
                 sysOrg1 = orgService.selectOrgById(o.getParentId(), SecurityConstants.INNER);
             } else {
                 sysOrg1 = orgService.selectOrgById(orgService.selectOrgById(o.getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER);
+                if (-1 == sysOrg1.getShortName().indexOf("地区行社")) {
+                    sysOrg1 = orgService.selectOrgById(orgService.selectOrgById(orgService.selectOrgById(o.getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER);
+                }
             }
             IntrusionTestReportVO intrusionTestReportVO1 = resumptionReportMapper.selectIntrusionTestReport(resumptionDTO.getSearchTime(), o.getPath());
             BeanUtils.copyProperties(intrusionTestReportVO1, intrusionTestReportVO);
-            intrusionTestReportVO.setCity(sysOrg1.getShortName().split("地区行社")[0]);
+            intrusionTestReportVO.setCity(sysOrg1.getShortName().indexOf("地区行社")==-1?sysOrg1.getShortName().substring(0,2):sysOrg1.getShortName().split("地区行社")[0]);
             intrusionTestReportVO.setOrgName(o.getShortName());
             Integer integer = monitorAccessReportMapper.selectNetworkNumberByPath(o.getPath());
             intrusionTestReportVO.setNetworkNumber(integer);
@@ -170,7 +173,7 @@ public class ResumptionReportServiceImpl implements ResumptionReportService {
             }
             IntrusionTestReportVO intrusionTestReportVO1 = resumptionReportMapper.selectServiceBankReport(resumptionDTO.getSearchTime(), o.getPath());
             BeanUtils.copyProperties(intrusionTestReportVO1, intrusionTestReportVO);
-            intrusionTestReportVO.setCity(sysOrg1.getShortName().split("地区行社")[0]);
+            intrusionTestReportVO.setCity(sysOrg1.getShortName().indexOf("地区行社")==-1?sysOrg1.getShortName().substring(0,2):sysOrg1.getShortName().split("地区行社")[0]);
             intrusionTestReportVO.setOrgName(o.getShortName());
             Integer integer = monitorAccessReportMapper.selectNetworkNumberByPath(o.getPath());
             intrusionTestReportVO.setNetworkNumber(integer);
@@ -221,7 +224,7 @@ public class ResumptionReportServiceImpl implements ResumptionReportService {
             }
             IntrusionTestReportVO intrusionTestReportVO1 = resumptionReportMapper.selectStandbyPower(resumptionDTO.getStartTime(), resumptionDTO.getEndTime(), o.getPath());
             BeanUtils.copyProperties(intrusionTestReportVO1, intrusionTestReportVO);
-            intrusionTestReportVO.setCity(sysOrg1.getShortName().split("地区行社")[0]);
+            intrusionTestReportVO.setCity(sysOrg1.getShortName().indexOf("地区行社")==-1?sysOrg1.getShortName().substring(0,2):sysOrg1.getShortName().split("地区行社")[0]);
             intrusionTestReportVO.setOrgName(o.getShortName());
             Integer integer = monitorAccessReportMapper.selectNetworkNumberByPath(o.getPath());
             intrusionTestReportVO.setNetworkNumber(integer);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/safetyInspect/mapper/SafetyInspectMapper.java

@@ -27,17 +27,17 @@ public interface SafetyInspectMapper {
     List<SysOrg> selectAllOrg();
 
     /**
-     * 机构维度
+     * zic机构维度
      * @return
      */
-    Map orgDimension(@Param("orgPath") String orgPath,@Param("year") String year,@Param("orgType") Integer orgType);
+    Map orgDimension(@Param("orgPath") String orgPath,@Param("year") String year,@Param("orgType") Integer orgType,@Param("type")Integer type);
 
     /**
-     * 隐患维度
+     * zic隐患维度
      * @param orgPath
      * @param year
      * @param orgType
      * @return
      */
-    Map pitfallDimension (@Param("orgPath") String orgPath,@Param("year") String year,@Param("orgType") Integer orgType);
+    Map pitfallDimension (@Param("orgPath") String orgPath,@Param("year") String year,@Param("orgType") Integer orgType,@Param("type")Integer type);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/safetyInspect/service/impl/SafetyInspectServiceImpl.java

@@ -61,18 +61,22 @@ public class SafetyInspectServiceImpl implements SafetyInspectService {
                 sysOrg1 = orgService.selectOrgById(s.getParentId(), SecurityConstants.INNER);
             } else {
                 sysOrg1 = orgService.selectOrgById(orgService.selectOrgById(s.getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER);
+                if (-1 == sysOrg1.getShortName().indexOf("地区行社")) {
+                    sysOrg1 = orgService.selectOrgById(orgService.selectOrgById(orgService.selectOrgById(s.getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER);
+                }
             }
-            safetyInspectVO.setCity(sysOrg1.getShortName().split("地区行社")[0]);
+            safetyInspectVO.setCity(sysOrg1.getShortName().indexOf("地区行社")==-1?sysOrg1.getShortName().substring(0,2):sysOrg1.getShortName().split("地区行社")[0]);
             safetyInspectVO.setOrgName(s.getShortName());
             //次数
             SafetyInspectVO safetyInspectVOS = safetyInspectMapper.selectAllByPath(s.getPath(),safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType());
             //机构维度
-            Map map = safetyInspectMapper.orgDimension(s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType());
+            Map map = safetyInspectMapper.orgDimension(s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(),4);
             safetyInspectVO.setPlanInspectOrg(Integer.valueOf(map.get("planInspectOrg").toString()));
             safetyInspectVO.setRealityInspectOrg(Integer.valueOf(map.get("realityInspectOrg").toString()));
             safetyInspectVO.setInspectCoverRate(map.get("inspectCoverRate").toString());
             safetyInspectVO.setOrgName(s.getShortName());
-            Map map1 = safetyInspectMapper.pitfallDimension(s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType());
+            Map map1 = safetyInspectMapper.pitfallDimension(s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(),4);
+
             safetyInspectVO.setPitfallNumber(Integer.valueOf(map1.get("pitfallNumber").toString()));
             safetyInspectVO.setRectificationNumber(Integer.valueOf(map1.get("rectificationNumber").toString()));
             safetyInspectVO.setRectificationRate(map1.get("rectificationRate").toString());
@@ -109,20 +113,23 @@ public class SafetyInspectServiceImpl implements SafetyInspectService {
                 sysOrg1 = orgService.selectOrgById(s.getParentId(), SecurityConstants.INNER);
             } else {
                 sysOrg1 = orgService.selectOrgById(orgService.selectOrgById(s.getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER);
+                if (-1 == sysOrg1.getShortName().indexOf("地区行社")) {
+                    sysOrg1 = orgService.selectOrgById(orgService.selectOrgById(orgService.selectOrgById(s.getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER);
+                }
             }
             Integer integer = monitorAccessReportMapper.selectNetworkNumberByPath(s.getPath());
             safetyInspectVO.setPlanInspectOrg(integer);
-            safetyInspectVO.setCity(sysOrg1.getShortName().split("地区行社")[0]);
+            safetyInspectVO.setCity(sysOrg1.getShortName().indexOf("地区行社")==-1?sysOrg1.getShortName().substring(0,2):sysOrg1.getShortName().split("地区行社")[0]);
             safetyInspectVO.setOrgName(s.getShortName());
             //次数
             SafetyInspectVO safetyInspectVOS = safetyInspectMapper.selectSelfByPath(safetyInspectDTO.getCycle(),s.getPath(),safetyInspectDTO.getYear(),safetyInspectDTO.getOrgType());
             //机构维度
-            Map map = safetyInspectMapper.orgDimension(s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType());
+            Map map = safetyInspectMapper.orgDimension(s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(),3);
             safetyInspectVO.setPlanInspectOrg(Integer.valueOf(map.get("planInspectOrg").toString()));
             safetyInspectVO.setRealityInspectOrg(Integer.valueOf(map.get("realityInspectOrg").toString()));
             safetyInspectVO.setInspectCoverRate(map.get("inspectCoverRate").toString());
             safetyInspectVO.setOrgName(s.getShortName());
-            Map map1 = safetyInspectMapper.pitfallDimension(s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType());
+            Map map1 = safetyInspectMapper.pitfallDimension(s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(),3);
             safetyInspectVO.setPitfallNumber(Integer.valueOf(map1.get("pitfallNumber").toString()));
             safetyInspectVO.setRectificationNumber(Integer.valueOf(map1.get("rectificationNumber").toString()));
             safetyInspectVO.setRectificationRate(map1.get("rectificationRate").toString());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/ApiPlanController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.domain.DateRange;
 import com.xunmei.common.core.enums.CycleCommonEnum;
+import com.xunmei.common.core.enums.OrgTypeEnum;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
@@ -70,7 +71,8 @@ public class ApiPlanController {
             AppPlan plan = appPlanService.getById(dto.getId());
             //如果选择了计划立即生效
             if (plan.getBuildTaskNow() == 1) {
-                List<AppPlan> list = appPlanService.list(new LambdaQueryWrapper<AppPlan>().eq(AppPlan::getParentId, plan.getId()).eq(AppPlan::getDeleted, 0));
+                LambdaQueryWrapper<AppPlan> wrapper=new LambdaQueryWrapper<AppPlan>().eq(AppPlan::getParentId, plan.getId()).eq(AppPlan::getDeleted, 0);
+                List<AppPlan> list = appPlanService.list(wrapper);
                 list.add(plan);
                 List<Object> newlist = new ArrayList<>(list);
                 resumptionTaskBusiness.rebuildCurrentCycleTask(newlist);
@@ -188,19 +190,18 @@ public class ApiPlanController {
     @GetMapping(value = "/distributeCheHui/{id}")
 //    @RequiresPermissions("core:plan:findById")
     public AjaxResult distributeCheHui(@PathVariable Long id) {
-        int i = appPlanService.distributeCheHui(id);
+        AppPlan planOld =appPlanService.getById(id);
+        AppPlan planNew = appPlanService.distributeCheHui(id);
         //撤回后下发，不重新生成任务
-//        AppPlan plan = appPlanService.getById(id);
-//
-//        //撤回后的下发如果存在子计划并且勾选立即执行也需要生成任务
-//        if (plan.getBuildTaskNow() == 1) {
-//            List<AppPlan> list = appPlanService.list(new LambdaQueryWrapper<AppPlan>().eq(AppPlan::getParentId, plan.getId()).eq(AppPlan::getDeleted, 0));
-//            list.add(plan);
-//            List<Object> newlist = new ArrayList<>(list);
-//            resumptionTaskBusiness.rebuildCurrentCycleTask(newlist);
-//
-//        }
-        return AjaxResult.success(i);
+
+        //行社的第一次下发也是走这里，如果是所属机构是行社且第一次下发，则要生成任务
+        if (planOld.getBuildTaskNow() == 1 && ObjectUtil.equal(planOld.getPlanOfOrgType().intValue(), OrgTypeEnum.HANG_SHE.getCode())
+                && ObjectUtil.equal(planOld.getPlanStatus(),0)) {
+            List<Object> newlist = new ArrayList<>();
+            newlist.add(planNew);
+            resumptionTaskBusiness.rebuildCurrentCycleTask(newlist);
+        }
+        return AjaxResult.success(planNew!=null);
     }
 
     @ApiOperation(value = "获取详情")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/AppPlanService.java

@@ -86,7 +86,7 @@ public interface AppPlanService extends IService<AppPlan> {
 
     void cheHui(Long id);
 
-    int distributeCheHui(Long id);
+    AppPlan distributeCheHui(Long id);
 
     AjaxResult buildPdf();
     AjaxResult buildResumptionPdf(Long id);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -269,7 +269,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
     }
 
     @Override
-    public int distributeCheHui(Long id) {
+    public AppPlan distributeCheHui(Long id) {
         AppPlan plan = baseMapper.selectById(id);
         //设置计划状态
         plan.setPlanStatus(1);
@@ -281,7 +281,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             plan.setDistribute("0");
         }
         baseMapper.updateById(plan);
-        return 1;
+        return plan;
     }
 
     /**

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-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRegisterSericeImpl.java

@@ -272,11 +272,19 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
                         .collect(Collectors.toList()));
             }
 
-            List<TaskRegisterNfcVo> areaNfcs = nfcs.stream()
-                    .filter(nfc -> !usedNfcId.contains(nfc.getNfcId()) && ObjectUtil.equal(nfc.getAreaId(), point.getAreaId()))
-                    .collect(Collectors.toList());
-            usedNfcId.addAll(areaNfcs.stream().map(TaskRegisterNfcVo::getNfcId).collect(Collectors.toList()));
-            point.setNfcList(areaNfcs);
+            point.setNfcList(new ArrayList<>());
+            if(ObjectUtil.equal( point.getMustCheck(),1)){
+                for (TaskRegisterNfcVo nfc : nfcs) {
+                    if(usedNfcId.contains(nfc.getNfcId())){
+                        continue;
+                    }
+
+                    if(ObjectUtil.equal(point.getAreaId(),nfc.getAreaId())){
+                        point.getNfcList().add(nfc);
+                        usedNfcId.add(nfc.getNfcId());
+                    }
+                }
+            }
         }
         vo.setCheckList(points);
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/domain/CoreSafetyBookAqbwbndjh.java

@@ -16,6 +16,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import com.xunmei.common.core.web.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 安全保卫部年度计划对象 core_safety_book_aqbwbndjh
@@ -35,7 +36,9 @@ public class CoreSafetyBookAqbwbndjh extends BaseEntity {
      * $column.columnComment
      */
     private Long id;
-
+    @TableField(exist = false)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private List<Date> range;
     /**
      * 工作主题
      */
@@ -48,7 +51,7 @@ public class CoreSafetyBookAqbwbndjh extends BaseEntity {
     /**
      * 开会日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty(value = "记录日期")
     private Date date;
 
@@ -69,6 +72,8 @@ public class CoreSafetyBookAqbwbndjh extends BaseEntity {
      */
     @ApiModelProperty(value = "机构id")
     private Long orgId;
+    private String type;
+    private Long year;
     @TableField(exist = false)
     private String userNames;
     @TableField(exist = false)

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/domain/CoreSafetyBookHsggbsdj.java

@@ -35,7 +35,8 @@ public class CoreSafetyBookHsggbsdj extends BaseEntity {
      * $column.columnComment
      */
     private Long id;
-
+    @TableField(exist = false)
+    private List<Date> range;
     /**
      * 工作主题
      */
@@ -69,6 +70,7 @@ public class CoreSafetyBookHsggbsdj extends BaseEntity {
     private String joinNames;
     @TableField(exist = false)
     private List<Long> userIds;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/service/impl/CoreSafetyBookAqbwbndjhServiceImpl.java

@@ -97,10 +97,10 @@ public class CoreSafetyBookAqbwbndjhServiceImpl extends ServiceImpl<CoreSafetyBo
         coreSafetyBookAqbwbndjh.setCreateTime(DateUtils.getNowDate());
         coreSafetyBookAqbwbndjh.setCreateBy(SecurityUtils.getUserId().toString());
         coreSafetyBookAqbwbndjhMapper.insert(coreSafetyBookAqbwbndjh);
-        for (Long id :
-                coreSafetyBookAqbwbndjh.getUserIds()) {
-            coreSafetyBookAqbwbndjhUserMapper.insert(new CoreSafetyBookAqbwbndjhUser(coreSafetyBookAqbwbndjh.getId(), id));
-        }
+//        for (Long id :
+//                coreSafetyBookAqbwbndjh.getUserIds()) {
+//            coreSafetyBookAqbwbndjhUserMapper.insert(new CoreSafetyBookAqbwbndjhUser(coreSafetyBookAqbwbndjh.getId(), id));
+//        }
         return 1;
     }
 
@@ -114,11 +114,11 @@ public class CoreSafetyBookAqbwbndjhServiceImpl extends ServiceImpl<CoreSafetyBo
     public int updateCoreSafetyBookAqbwbndjh(CoreSafetyBookAqbwbndjh coreSafetyBookAqbwbndjh) {
         coreSafetyBookAqbwbndjh.setUpdateTime(DateUtils.getNowDate());
         coreSafetyBookAqbwbndjh.setUpdateBy(SecurityUtils.getUserId().toString());
-        coreSafetyBookAqbwbndjhUserMapper.delete(new LambdaQueryWrapper<CoreSafetyBookAqbwbndjhUser>().eq(CoreSafetyBookAqbwbndjhUser::getAqbwbndjhId, coreSafetyBookAqbwbndjh.getId()));
-        for (Long id :
-                coreSafetyBookAqbwbndjh.getUserIds()) {
-            coreSafetyBookAqbwbndjhUserMapper.insert(new CoreSafetyBookAqbwbndjhUser(coreSafetyBookAqbwbndjh.getId(), id));
-        }
+//        coreSafetyBookAqbwbndjhUserMapper.delete(new LambdaQueryWrapper<CoreSafetyBookAqbwbndjhUser>().eq(CoreSafetyBookAqbwbndjhUser::getAqbwbndjhId, coreSafetyBookAqbwbndjh.getId()));
+//        for (Long id :
+//                coreSafetyBookAqbwbndjh.getUserIds()) {
+//            coreSafetyBookAqbwbndjhUserMapper.insert(new CoreSafetyBookAqbwbndjhUser(coreSafetyBookAqbwbndjh.getId(), id));
+//        }
         return coreSafetyBookAqbwbndjhMapper.updateById(coreSafetyBookAqbwbndjh);
     }
 

soc-modules/soc-modules-core/src/main/resources/mapper/letter/CoreIntroduceLetterMapper.xml

@@ -47,6 +47,7 @@
     <select id="selectPageList"
             resultType="com.xunmei.common.core.domain.letter.vo.CoreIntroduceLetterVo">
         select * from core_introduce_letter a where deleted=0
+
         <if test="coreIntroduceLetter.orgId != null ">
             and a.org_id = #{coreIntroduceLetter.orgId}
         </if>
@@ -70,6 +71,30 @@
         </if>
         order by a.create_time DESC
     </select>
+    <select id="selectPageListForApp"
+            resultType="com.xunmei.common.core.domain.letter.vo.CoreIntroduceLetterVo">
+        select
+        a.*,
+        c.approve_status as approveStatus,
+        c.approve_remark as approveRemark,
+        c.approve_time
+        from core_introduce_letter a
+        left join core_introduce_letter_approve_log c on a.id=c.letter_id
+        where a.deleted=0 ANd a.status!=0 and a.type in (2,3)
+        <if test="coreIntroduceLetter.orgId != null ">
+            and c.org_id = #{coreIntroduceLetter.orgId}
+        </if>
+        <if test="coreIntroduceLetter.letterNo !=null  and coreIntroduceLetter.letterNo !=''">
+            and a.letter_no like concat('%', #{coreIntroduceLetter.letterNo}, '%')
+        </if>
+        <if test="coreIntroduceLetter.reasons !=null  and coreIntroduceLetter.reasons !=''">
+            and a.reasons like concat('%', #{coreIntroduceLetter.reasons}, '%')
+        </if>
+        <if test="coreIntroduceLetter.type !=null  and coreIntroduceLetter.type !=''">
+            and a.type = #{coreIntroduceLetter.type}
+        </if>
+        order by a.create_time DESC
+    </select>
 
 
     <insert id="insertCoreIntroduceLetter" parameterType="com.xunmei.common.core.domain.letter.domain.CoreIntroduceLetter">

soc-modules/soc-modules-core/src/main/resources/mapper/reportForms/ResumptionReportMapper.xml

@@ -17,11 +17,17 @@
         OR COUNT( a.id )= 0,
         '0%',
         IFNULL(
-        CONCAT( SUM( IF ( a.`status` = 3, 1, 0 ))/ COUNT( a.id )* 100, '%' ),
+        CONCAT(
+        ROUND( SUM( IF ( a.`status` = 3, 1, 0 ))/ COUNT( a.id )* 100, 2 ),
+        '%'
+        ),
         '0%'
         )) AS frontRate,
         IFNULL( SUM( a.exception_count ), 0 ) AS frontAbnormalNumber,
-        IFNULL( COUNT( d.id )/ IFNULL( SUM( a.exception_count ), 0 )* 100, '0%' ) AS totalRealityRectificationRate
+        IFNULL(
+        CONCAT( ROUND( COUNT( d.id )/ IFNULL( SUM( a.exception_count ), 0 )* 100, 2 ), '%' ),
+        '0%'
+        ) AS totalRealityRectificationRate
         FROM
         core_resumption a
         LEFT JOIN core_resumption_plan b ON a.plan_id = b.id
@@ -56,20 +62,28 @@
     <select id="selectIntrusionTestReport"
             resultType="com.xunmei.core.reportForms.resumption.vo.IntrusionTestReportVO">
         SELECT
-            IFNULL(a.exception_count,0) AS abnormalNumber,
-            COUNT( a.id ) AS planNumber,
-            IFNULL( SUM( IF ( a.`status` = 3, 1, 0 )), 0 ) AS realityNumber,
-            IF
-                (
-                            IFNULL( SUM( IF ( a.`status` = 3, 1, 0 )), 0 )= 0
-                        OR COUNT( a.id )= 0,
-                            '0%',
-                            CONCAT(
-                                            IFNULL( SUM( IF ( a.`status` = 3, 1, 0 )), 0 )/ COUNT( a.id )* 100,
-                                            '%'
-                                )) AS realityRate,
-            COUNT( c.id ) AS realityRectificationNumber,
-            IF(COUNT( c.id )=0 OR IFNULL(a.exception_count,0)=0,'0%',CONCAT(COUNT( c.id )/IFNULL(a.exception_count,0)*100,'%'))	 AS realityRectificationRate
+        IFNULL( a.exception_count, 0 ) AS abnormalNumber,
+        COUNT( a.id ) AS planNumber,
+        IFNULL( SUM( IF ( a.`status` = 3, 1, 0 )), 0 ) AS realityNumber,
+        IF
+        (
+        IFNULL( SUM( IF ( a.`status` = 3, 1, 0 )), 0 )= 0
+        OR COUNT( a.id )= 0,
+        '0%',
+        CONCAT(
+        ROUND(
+        IFNULL( SUM( IF ( a.`status` = 3, 1, 0 )), 0 )/ COUNT( a.id )* 100,
+        2
+        ),
+        '%'
+        )) AS realityRate,
+        COUNT( c.id ) AS realityRectificationNumber,
+        IF
+        (
+        COUNT( c.id )= 0
+        OR IFNULL( a.exception_count, 0 )= 0,
+        '0%',
+        CONCAT( COUNT( c.id )/ IFNULL( a.exception_count, 0 )* 100, '%' )) AS realityRectificationRate
         FROM
             core_resumption a
                 LEFT JOIN core_resumption_plan b ON a.plan_id = b.id

soc-modules/soc-modules-core/src/main/resources/mapper/reportForms/SafetyInspectMapper.xml

@@ -135,30 +135,28 @@
     </select>
     <select id="pitfallDimension" resultType="java.util.Map">
         SELECT
-            IFNULL( SUM( IF ( a.confirm_status >= 2 and a.reform_status in (10,11), 1, 0 )), 0 ) AS pitfallNumber,
-            IFNULL( SUM( IF ( a.reform_status = 11, 1, 0 )), 0 ) AS rectificationNumber,
-            IFNULL(
-                    CONCAT(
-                            ROUND(
-                                            SUM(
-                                                    IF
-                                                        ( a.reform_status = 11, 1, 0 ))/ SUM(
-                                                    IF
-                                                        ( a.confirm_status >= 2 and a.reform_status in (10,11), 1, 0 ))* 100,
-                                            2
-                                ),
-                            '%'
-                        ),
-                    '0%'
-                ) AS rectificationRate
+        IFNULL( SUM( IF ( a.confirm_status >= 2 AND a.reform_status IN ( 10, 11 ), 1, 0 ) ), 0 ) AS pitfallNumber,
+        IFNULL( SUM( IF ( a.reform_status = 11, 1, 0 )), 0 ) AS rectificationNumber,
+        IFNULL(
+        CONCAT(
+        ROUND(
+        SUM(
+        IF
+        ( a.reform_status = 11, 1, 0 ))/ IFNULL( SUM( IF ( a.confirm_status >= 2 AND a.reform_status IN ( 10, 11 ), 1, 0 ) ), 0 )* 100,
+        2
+        ),
+        '%'
+        ),
+        '0%'
+        ) AS rectificationRate
         FROM
         core_question a
         LEFT JOIN sys_org b ON a.org_id = b.id
         LEFT JOIN core_safety_task c ON c.id = a.src_task_id
         LEFT JOIN core_safecheck_plan d ON c.plan_id=d.id
         WHERE
-        a.src_type = 2
-        AND d.check_type =3
+            a.src_type = 2
+        AND d.check_type =#{type}
         <if test="orgPath !=null and orgPath !=''">
             and a.org_path like concat(#{orgPath},'%')
         </if>

soc-modules/soc-modules-core/src/main/resources/mapper/safetybook/CoreSafetyBookAqbwbndjhMapper.xml

@@ -70,6 +70,8 @@
         a.update_by,
         a.images,
         a.org_id,
+        a.type,
+        a.year,
         u2.name as userName,
         o.name as orgName,
         group_concat(u.name) as userNames
@@ -80,10 +82,15 @@
         left join sys_org o on o.id=a.org_id
         <where>
 
-            <if test="aq.date != null ">
-                and a.date = #{aq.date}
+            <if test="aq.year != null ">
+                and a.year = #{aq.year}
+            </if>
+            <if test="aq.orgId != null ">
+                and a.org_id = #{aq.orgId}
+            </if>
+            <if test="aq.range!=null and aq.range.size >1">
+                and  a.date <![CDATA[>=]]>  #{aq.range[0]} and a.date  <![CDATA[<=]]> #{aq.range[1]}
             </if>
-
 
         </where>
         group by a.id,a.create_time
@@ -100,10 +107,14 @@
                a.update_by,
                a.images,
                a.org_id,
+               a.type,
+               a.year,
+               o.name as org_name,
                group_concat(u.name) as userNames
         from core_safety_book_aqbwbndjh a
                  left join core_safety_book_aqbwbndjh_user au on au.aqbwbndjh_id = a.id
                  left join sys_user u on u.id = au.user_id
+        left join sys_org o on o.id = a.org_id
         where a.id = #{id}
         group by a.id
 

soc-modules/soc-modules-core/src/main/resources/mapper/safetybook/CoreSafetyBookHsggbsdjMapper.xml

@@ -78,10 +78,12 @@
             <if test="hs.title != null  and hs.title != ''">
                 and h.title like concat(concat('%', #{hs.title}),'%')
             </if>
-            <if test="hs.date != null ">
-                and date = #{hs.date}
+            <if test="hs.orgId != null ">
+                and h.org_id = #{hs.orgId}
+            </if>
+            <if test="hs.range!=null and hs.range.size >1">
+                and  h.date <![CDATA[>=]]>  #{hs.range[0]} and h.date  <![CDATA[<=]]> #{hs.range[1]}
             </if>
-
         </where>
         GROUP BY
         h.id

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -743,6 +743,7 @@ SELECT t.id,
 
         where nfc.org_id = #{orgId}
           AND nfc.ENABLE = 0
+          And nfc.del_flag=0
           AND p.plan_id = #{planId}
           AND p.point_scan = 1
     </select>

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/domain/SysPhysicalDefenseConstruction.java

@@ -68,6 +68,7 @@ public class SysPhysicalDefenseConstruction extends BaseEntity {
     @ApiModelProperty(value = "证书")
     private String certificate;
     @ApiModelProperty(value = "物防建设类型:1:机构2:业务库3:在行4:离行")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long type;
 
     /**

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;
+}