Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.4

project_data/sql/0.0.4/soc/soc.sql

@@ -323,3 +323,9 @@ INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type
 INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 0, '行长（主任）', '2', 'hsggbsdj_role', NULL, 'default', 'N', '0', '省联社账号', '2023-12-05 14:56:55', '省联社账号', '2023-12-07 15:22:39', NULL);
 INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 0, '副行长（副主任）', '3', 'hsggbsdj_role', NULL, 'default', 'N', '0', '省联社账号', '2023-12-07 15:22:48', '', NULL, NULL);
 INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 0, '行长助理（主任助理）', '4', 'hsggbsdj_role', NULL, 'default', 'N', '0', '省联社账号', '2023-12-07 15:23:04', '', NULL, NULL);
+
+
+UPDATE sys_menu set menu_name='安全检查' WHERE menu_name='安全检查登记' and platform_type=0;
+UPDATE sys_menu set menu_name='布防撤防' WHERE menu_name='布撤防状态登记' and platform_type=0;
+UPDATE sys_menu set menu_name='教育培训' WHERE menu_name='培训登记' and platform_type=0;
+UPDATE sys_menu set menu_name='预案演练' WHERE menu_name='演练登记' and platform_type=0;

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/retrieval/vo/CoreMonitoringRetrievalTaskOneVo.java

@@ -43,28 +43,28 @@ public class CoreMonitoringRetrievalTaskOneVo {
     /**
      * 开始时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty(value = "开始时间")
     private Date planStartTime;
 
     /**
      * 结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty(value = "结束时间")
     private Date planEndTime;
 
     /**
      * 调阅开始时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty(value = "调阅开始时间")
     private Date startTime;
 
     /**
      * 调阅结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty(value = "调阅结束时间")
     private Date endTime;
 

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

@@ -315,12 +315,11 @@ public class CoreOutInRecordServiceImpl extends ServiceImpl<CoreOutInRecordMappe
         }
         //核验图片
         final String checkImage = record.getCheckImage();
-        if (ObjectUtil.isEmpty(checkImage) || !checkImage.contains(File.separator)) {
+        if (ObjectUtil.isEmpty(checkImage)) {
             data.put("checkImage", new ArrayList<>());
         } else {
             data.put("checkImage", getFileRealPath(Arrays.asList(checkImage.split(",")), prefixPath, staticsPath));
         }
-        log.info("***********:{}",JSON.toJSONString(data));
         return data;
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/panel/service/impl/PanelServiceImpl.java

@@ -282,11 +282,14 @@ public class PanelServiceImpl implements PanelService {
                     continue;
                 }
                 final List<String> list = JSON.parseArray(json, String.class);
-                list.forEach(item -> {
-                    final Map map = JSON.parseObject(item, Map.class);
-                    final String fileName = map.get("url").toString();
-                    fileLit.add(fileName);
-                });
+                for (String str : list) {
+                    final Map map = JSON.parseObject(str, Map.class);
+                    map.put("createTime",vo.getCreateTime());
+
+                    fileLit.add(JSON.toJSONString(map));
+                }
+
+                fileLit.addAll(list);
             }
             hashMap.put("index2", fileLit);
         }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/domain/Question.java

@@ -3,6 +3,7 @@ package com.xunmei.core.question.domain;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -37,6 +38,7 @@ public class Question extends BaseEntity {
      * $column.columnComment
      */
     @JsonSerialize(using = ToStringSerializer.class)
+    @TableId
     private Long id;
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/service/IQuestionService.java

@@ -37,6 +37,8 @@ public interface IQuestionService extends IService<Question> {
      */
     int insertQuestion(Question question);
 
+    Question handleQuestion(Question question);
+
     /**
      * 查询隐患问题清单分页数据
      *

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/service/impl/QuestionServiceImpl.java

@@ -41,6 +41,7 @@ import com.xunmei.core.safetyCheck.domain.CoreSafetyTaskDataRemarkimg;
 import com.xunmei.core.safetyCheck.service.ICoreSafetyTaskDataRemarkimgService;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.RemoteUserService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -61,6 +62,7 @@ import java.util.stream.Collectors;
  * @date 2023-09-12
  */
 @Service
+@Slf4j
 public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> implements IQuestionService {
     @Autowired
     private QuestionFlowMapper questionFlowMapper;
@@ -192,8 +194,21 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
     @Override
     @Transactional
     public int insertQuestion(Question question) {
-        question.setId(IDHelper.id());
+//        question.setId(IDHelper.id());
 
+//        if (ObjectUtil.equal(question.getOrgId(), SecurityUtils.getLoginUser().getOrgId())) {
+//            question.setConfirmStatus(QuestionConfirmEnum.Confirmed.getValue());
+//            question.setReformStatus(QuestionReformEnum.Unreform.getValue());
+//        } else {
+//            question.setConfirmStatus(QuestionConfirmEnum.Unconfirm.getValue());
+//            question.setReformStatus(null);
+//        }
+        question = handleQuestion(question);
+        return baseMapper.insert(question);
+    }
+
+    @Override
+    public Question handleQuestion(Question question) {
         if (ObjectUtil.equal(question.getOrgId(), SecurityUtils.getLoginUser().getOrgId())) {
             question.setConfirmStatus(QuestionConfirmEnum.Confirmed.getValue());
             question.setReformStatus(QuestionReformEnum.Unreform.getValue());
@@ -202,10 +217,9 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
             question.setReformStatus(null);
         }
 
-        return baseMapper.insert(question);
+        return question;
     }
 
-
     /**
      * 确认
      *

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

@@ -155,7 +155,6 @@ public class ResumptionServiceImpl implements ResumptionService {
         resumptionDelService.delResumptionData(taskId);
 
 
-
         //保存新的数据
         AppResumptionData data = null;
         List<ResumptionItemVo> checks = taskDetailVo.getChecks();
@@ -216,15 +215,15 @@ public class ResumptionServiceImpl implements ResumptionService {
                             .reformDeadline(DateUtil.endOfDay(DateUtil.offsetDay(new Date(), Integer.parseInt(point.getRectificationDeadline()))))
                             .build();
                     IdWorker.getId(question);
-                    if (ObjectUtil.equal(question.getOrgId(),SecurityUtils.getLoginUser().getOrgId())) {
+                    if (ObjectUtil.equal(question.getOrgId(), SecurityUtils.getLoginUser().getOrgId())) {
                         question.setConfirmStatus(QuestionConfirmEnum.Confirmed.getValue());
                         question.setReformStatus(QuestionReformEnum.Unreform.getValue());
                     } else {
                         question.setConfirmStatus(QuestionConfirmEnum.Unconfirm.getValue());
                         question.setReformStatus(null);
                     }
-                    questions.add(question);
-                    questionService.insertQuestion(question);
+                    questions.add(questionService.handleQuestion(question));
+//                    questionService.insertQuestion(question);
                 }
 
                 if (ObjectUtil.equal(point.getResValue(), 1)) {
@@ -267,23 +266,22 @@ public class ResumptionServiceImpl implements ResumptionService {
          */
 
         //1.批量插入 履职数据。
-        if(ards.size() > 0){
+        if (ards.size() > 0) {
             resumptionMapper.batchInsertResumptionData(ards);
         }
         //2.批量插入 问题数据。
-        if(questions.size() > 0){
+        if (questions.size() > 0) {
             resumptionMapper.batchInsertResumptionQuestion(questions);
         }
         //3.批量插入 图片数据。
-        if(adImgs.size() > 0){
+        if (adImgs.size() > 0) {
             resumptionMapper.batchInsertResumptionImg(adImgs);
         }
         //3.批量插入 扫描数据。
-        if(dataNfcs.size() > 0){
+        if (dataNfcs.size() > 0) {
             resumptionMapper.batchInsertResumptionNfc(dataNfcs);
         }
 
-
         resumptionMapper.updateById(sysResumption);
         if (ObjectUtil.equal(taskDetailVo.getSubType(), 2)) {
             TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {

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

@@ -191,10 +191,11 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
                         .eq(AppPlan::getParentId, dto.getId()));
                 //如果子计划已存在
                 if (tempplan != null) {
+                    //从停用状态下发，才会有已存在的子计划；
                     tempplan.setPlanStatus(d.getStatus() > 0 ? 1 : 2);
                     tempplan.setDistributePlanStatus(d.getStatus().toString());
                     tempplan.setDistributeStatus("1");
-                    if (immediateEffect) {
+                    if (!immediateEffect) {
                         //停用状态下发，逻辑删除旧的计划，并生成一份副本
                         baseMapper.updateById(tempplan);
                         baseMapper.deleteById(tempplan);
@@ -204,9 +205,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
                         baseMapper.copyPlanOrgs(tempplan.getId(), hsPlanId);
                         baseMapper.copyPlanRoles(tempplan.getId(), hsPlanId);
                         baseMapper.copyPlanPoints(tempplan.getId(), hsPlanId);
-
-                        AppPlan newPlan = baseMapper.selectById(hsPlanId);
-                        hsPlans.add(newPlan);
+//                        AppPlan newPlan = baseMapper.selectById(hsPlanId);
                     } else {
                         baseMapper.updateById(tempplan);
                     }
@@ -266,18 +265,15 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         plan.setPlanStatus(1);
 //        plan.setBuildTaskNow(null);
 
-        if (immediateEffect && ObjectUtil.equal(oldPlan.getPlanStatus(), PlanStatus.DELETED.getCode())) {
+        baseMapper.updateById(plan);
+        if (ObjectUtil.equal(oldPlan.getPlanStatus(), PlanStatus.DELETED.getCode())) {
             //停用时下发且立即生效，逻辑删除旧计划并生成新计划
-            baseMapper.updateById(plan);
-
             baseMapper.copySelf(plan.getId(), parentId);
             baseMapper.copyPlanPoints(plan.getId(), parentId);
             baseMapper.copyPlanRoles(plan.getId(), parentId);
             baseMapper.copyPlanOrgs(plan.getId(), parentId);
 
             baseMapper.deleteById(plan);
-        } else {
-            baseMapper.updateById(plan);
         }
 
         if (immediateEffect) {
@@ -356,12 +352,12 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
                     .eq(AppPlan::getId, id);
             baseMapper.update(null, updateWrapper);
 
-            List<Long> childrenPlanIds = baseMapper.selectList(new LambdaQueryWrapper<AppPlan>()
-                            .eq(AppPlan::getParentId, id)
-                            .select(AppPlan::getSolidId))
-                    .stream().map(AppPlan::getSolidId).collect(Collectors.toList());
-            delete(childrenPlanIds);
+            List<AppPlan> childrenPlan = baseMapper.selectList(new LambdaQueryWrapper<AppPlan>()
+                    .eq(AppPlan::getParentId, id)
+                    .select(AppPlan::getSolidId, AppPlan::getId));
+            delete(childrenPlan.stream().map(AppPlan::getId).collect(Collectors.toList()));
 
+            List<Long> childrenPlanIds = childrenPlan.stream().map(AppPlan::getSolidId).collect(Collectors.toList());
             childrenPlanIds.add(plan.getSolidId());
             deleteAllTaskByPlanId(childrenPlanIds);
         }
@@ -452,6 +448,13 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         return result;
     }
 
+    /**
+     * immediateEffect:参数无效
+     *
+     * @param app
+     * @param immediateEffect
+     * @throws Exception
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void saveOrUpdatePlan(AppPlanVo app, Boolean immediateEffect) throws Exception {
@@ -529,8 +532,9 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             LambdaQueryWrapper<AppPlanToPoint> pointWrapper = new LambdaQueryWrapper<>();
             pointWrapper.eq(AppPlanToPoint::getPlanId, app.getId());
 
-            Boolean needCopy = immediateEffect
-                    && ObjectUtil.equal(existPlan.getPlanStatus(), PlanStatus.USING.getCode());
+            //任务为使用中且有已完成或停用，则下个周期生效，需要副本；任务为使用中且无已完成，则删除所有任务，并重新生成任务
+            Boolean needCopy = (ObjectUtil.equal(app.getTaskHasCompleted(), 1)
+                    && ObjectUtil.equal(existPlan.getPlanStatus(), PlanStatus.USING.getCode())) || ObjectUtil.equal(existPlan.getPlanStatus(), PlanStatus.DELETED.getCode());
             List<Object> needRebuildPlans = new ArrayList<>();
             //修改所有子计划
             List<AppPlan> appPlans = baseMapper.selectList(new LambdaQueryWrapper<AppPlan>().eq(AppPlan::getParentId, plan.getId()));
@@ -548,7 +552,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
 
                     baseMapper.updateById(ap);
                     baseMapper.deleteById(ap.getId());
-                    child = baseMapper.selectById(newChildPlanId);
+                } else {
                     needRebuildPlans.add(child);
                 }
                 Map<Long, AppPlanToPoint> planPoints = appPlanToItemMapper.selectList(pointWrapper).stream()
@@ -630,8 +634,6 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
                 baseMapper.deleteById(app.getId());
 
                 plan.setId(newPlanID);
-
-
             }
 
 //处理本计划关联
@@ -848,6 +850,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         plan.setPlanCreateOrgId(app.getPlanCreateOrgId());
         plan.setPlanOfOrgId(app.getPlanOfOrgId());
         plan.setPlanOfOrgType(app.getPlanOfOrgType());
+        plan.setTaskHasCompleted(app.getTaskHasCompleted());
         return plan;
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafetyTaskServiceImpl.java

@@ -215,7 +215,7 @@ public class CoreSafetyTaskServiceImpl extends ServiceImpl<CoreSafetyTaskMapper,
     @Override
     public WebPanelResult selectWebIndexData(PanelListDto req) {
         final int count = coreSafetyTaskMapper.selectCount(new LambdaQueryWrapper<CoreSafetyTask>()
-                .eq(CoreSafetyTask::getOrgId, req.getOrgId())
+                .eq(CoreSafetyTask::getCheckOrgId, req.getOrgId())
                 .eq(CoreSafetyTask::getStatus, 1))
                 .intValue();
         return WebPanelResult

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/ResumptionMapper.xml

@@ -125,12 +125,12 @@
     <select id="findResumptionApp" resultType="com.xunmei.core.resumption.vo.ResumptionAppVo">
         select r.id,r.plan_start_time,plan_end_time,r.status,r.name as plan_name,p.plan_cycle
         from core_resumption r
-        inner join core_resumption_plan p on r.plan_id = p.id and p.deleted=0 and p.plan_status=1
+        inner join core_resumption_plan p on r.plan_id = p.id
         where r.org_id=#{res.orgId}
         <if test="res.roleId!=null and res.roleId.size>0">
             and r.parent_plan_id in
             (select distinct plan_id from core_resumption_plan_to_role pr
-            inner join core_resumption_plan p on pr.plan_id=p.id and p.parent_id =-1 and p.deleted=0
+            inner join core_resumption_plan p on pr.plan_id=p.id and p.parent_id =-1
             where pr.role_id in
             <foreach collection="res.roleId" item="roleId" open="(" close=")" separator=",">
                 #{roleId}
@@ -472,6 +472,19 @@
 
     </insert>
     <insert id="batchInsertResumptionImg" parameterType="java.util.List">
+        INSERT INTO core_resumption_data_remarkimg
+        (`id`, `resumption_id`, `resumption_data_id`, `img_path`)
+        VALUES
+        <foreach collection="list" item="item" index="index"  separator="," >
+            (
+            #{item.id},
+            #{item.resumptionId},
+            #{item.resumptionDataId},
+            #{item.imgPath}
+            )
+        </foreach>
+    </insert>
+    <insert id="batchInsertResumptionNfc" parameterType="java.util.List">
         INSERT INTO core_resumption_data_nfc
         ( `id`, `resumption_id`, `nfc_id`, `submit_time`, `submit_by`, `status`, `scan_method`, `img`, `point_id` )
         VALUES
@@ -489,9 +502,6 @@
             )
         </foreach>
     </insert>
-    <insert id="batchInsertResumptionNfc" parameterType="java.util.List">
-
-    </insert>
     <update id="updatePlanId">
         update core_resumption set parent_plan_id=#{newPlanParentId},plan_id=#{newPlanId} where plan_id=#{oldPlanId} and (status=0 or status=1)
     </update>

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

@@ -128,13 +128,24 @@ public interface SysOrgMapper extends BaseMapper<SysOrg> {
     Map getDuty(String orgPath);
 
     Map getCertificate(String orgPath);
+    Integer getHaveSecurityNetworkNumber(String orgPath);
+
     Map getMonitorPeople(String orgPath);
-Integer getAlone(String orgPath);
+
+    Integer getAlone(String orgPath);
+
     Integer getManagerCertificate(String orgPath);
-    String getIsMonitor(@Param("orgPath") String orgPath,@Param("duties") String duties);
-Integer getManager(@Param("orgPath") String orgPath,@Param("isFull") String isFull);
+
+    String getIsMonitor(@Param("orgPath") String orgPath, @Param("duties") String duties);
+
+    Integer getManager(@Param("orgPath") String orgPath, @Param("isFull") String isFull);
+
     Integer getSafe(@Param("orgPath") String orgPath, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
 
+    Integer getSafeHeadToNetwork(@Param("type") Integer type, @Param("level") Integer level, @Param("orgPath") String orgPath);
+
+    Integer getJointHeadToNetwork(@Param("type") Integer type, @Param("level") Integer level, @Param("orgPath") String orgPath);
+
     Integer getEduNumber(@Param("orgPath") String orgPath, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
 
     Integer getEduUser(String orgPath);

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

@@ -221,11 +221,11 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
             securityWorkExport.setDepartureThroughWalls(Integer.valueOf(selfEquipment.get("departureThroughWalls").toString()));
             //中心建设时间
             Map centerConstruction = baseMapper.getCenterConstruction(s.getId());
-         if (null!=centerConstruction){
-             securityWorkExport.setCenterConstructionTime(centerConstruction.get("centerConstructionTime").toString());
-             securityWorkExport.setTransformTime(centerConstruction.get("transformTime").toString());
-             securityWorkExport.setBrand(centerConstruction.get("brand").toString());
-         }
+            if (null != centerConstruction) {
+                securityWorkExport.setCenterConstructionTime(centerConstruction.get("centerConstructionTime").toString());
+                securityWorkExport.setTransformTime(centerConstruction.get("transformTime").toString());
+                securityWorkExport.setBrand(centerConstruction.get("brand").toString());
+            }
 
             //高清摄像头
             Map camera = baseMapper.getCamera(s.getPath());
@@ -266,6 +266,21 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
             securityWorkExport.setCertificateTotal(Integer.valueOf(certificate.get("certificateTotal").toString()));
             securityWorkExport.setInternalCertificateNumber(Integer.valueOf(certificate.get("internalCertificateNumber").toString()));
             securityWorkExport.setOutsourceCertificateNumber(Integer.valueOf(certificate.get("outsourceCertificateNumber").toString()));
+            //配有保安网点数
+            Integer haveSecurityNetworkNumber = baseMapper.getHaveSecurityNetworkNumber(s.getPath());
+            securityWorkExport.setHaveSecurityNetworkNumber(haveSecurityNetworkNumber);
+
+            //安全责任总到网
+            Integer safeHeadToNetwork = baseMapper.getSafeHeadToNetwork(1, 1, s.getPath());
+            securityWorkExport.setSafeHeadToNetwork(safeHeadToNetwork);
+            Integer safeHeadToNetwork1 = baseMapper.getSafeHeadToNetwork(1, 2, s.getPath());
+            securityWorkExport.setJointNetworkToPeople(safeHeadToNetwork1);
+            Integer jointHeadToNetwork = baseMapper.getJointHeadToNetwork(2, 1, s.getPath());
+            securityWorkExport.setJointHeadToNetwork(jointHeadToNetwork);
+            Integer jointHeadToNetwork1 = baseMapper.getJointHeadToNetwork(2, 2, s.getPath());
+            securityWorkExport.setJointNetworkToPeople(jointHeadToNetwork1);
+            //总行安全检查
+
             //安全检查
             DateTime beginOfQuarter = DateUtil.beginOfQuarter(new java.util.Date());
             DateTime endOfQuarter = DateUtil.endOfQuarter(new Date());

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

@@ -109,6 +109,14 @@ public class SecurityWorkExport {
     private Integer outsourceCertificateNumber;
     @ExcelProperty(value = {"机构及人员配备","配有保安网点数"}, index = 44)
     private Integer haveSecurityNetworkNumber;
+    @ExcelProperty(value = {"责任制落实","各级治安保卫责任书签订情况（份）","总行（联社）与各职能部门、营业网点签订数"}, index = 44)
+private Integer safeHeadToNetwork;
+    @ExcelProperty(value = {"责任制落实","各级治安保卫责任书签订情况（份）","各职能部门、营业网点与各员工签订数"}, index = 44)
+    private Integer safeNetworkToPeople;
+    @ExcelProperty(value = {"责任制落实","各级联防协议书签订情况（份）","总行（联社）与当地机关、单位或居民签订协议书数量"}, index = 44)
+    private Integer jointHeadToNetwork;
+    @ExcelProperty(value = {"责任制落实","各级联防协议书签订情况（份）"," 各营业网点（离行式自助银行）与当地机关、单位或居民签订协议书数量"}, index = 44)
+    private Integer jointNetworkToPeople;
     @ExcelProperty(value = {"营业网点安全检查","本季度辖内所有营业网点组织开展自查次数（每个网点检查数量的累计数）"}, index = 45)
     private Integer quarterSelfInspectNumber;
     @ExcelProperty(value =  {"安全教育","本季度度总行(联社)组织开展安全教育次数"}, index = 46)

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -1071,6 +1071,46 @@ and a.org_path LIKE concat(#{orgPath}, '%')
             a.duties IN ( 2, 4, 5 )
           AND c.path LIKE concat(#{orgPath}, '%')
     </select>
+    <select id="getSafeHeadToNetwork" resultType="java.lang.Integer">
+        SELECT
+            COUNT( a.id )
+        FROM
+            core_safety_book_new a
+                LEFT JOIN sys_org b ON a.party_b_org = b.id
+        WHERE
+            type = #{type}
+          AND sign_level = #{level}
+          AND b.path LIKE concat(#{orgPath}, '%')
+    </select>
+    <select id="getJointHeadToNetwork" resultType="java.lang.Integer">
+        SELECT
+            COUNT( a.id )
+        FROM
+            core_safety_book_new a
+                LEFT JOIN sys_org b ON a.party_a_org = b.id
+        WHERE
+            a.type = #{type}
+          AND a.sign_level = #{level}
+          AND b.path LIKE concat(#{orgPath}, '%')
+    </select>
+    <select id="getHaveSecurityNetworkNumber" resultType="java.lang.Integer">
+        SELECT
+            COUNT( 1 )
+        FROM
+            sys_org
+        WHERE
+                id IN (
+                SELECT
+                    IF
+                        ( SUM( a.inner_count )+ SUM( a.outside_count )> 0, b.id, 0 )
+                FROM
+                    sys_org_extend a
+                        LEFT JOIN sys_org b ON a.org_id = b.id
+                WHERE
+                    b.path LIKE concat(#{orgPath}, '%')
+                GROUP BY
+                    a.id)
+    </select>
 
 
 </mapper>